Adding upstream version 1:10.11.6.upstream/1%10.11.6upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 34 insertions, 0 deletions

diff --git a/mysql-test/main/mysqltest_ps.result b/mysql-test/main/mysqltest_ps.result
new file mode 100644
index 00000000..153098ff
--- /dev/null
+++ b/mysql-test/main/mysqltest_ps.result
@@ -0,0 +1,34 @@
+select 1 + "2 a";
+1 + "2 a"
+3
+Warnings:
+Warning	1292	Truncated incorrect DOUBLE value: '2 a'
+create table t (a int primary key, b blob default '');
+select a, (2*a) AS a from t group by a;
+a	a
+Warnings:
+Warning	1052	Column 'a' in group statement is ambiguous
+drop table t;
+select 1 + "2 a";
+1 + "2 a"
+3
+Warnings:
+Warning	1292	Truncated incorrect DOUBLE value: '2 a'
+create table t (a int primary key, b blob default '');
+select a, (2*a) AS a from t group by a;
+a	a
+Warnings:
+Warning	1052	Column 'a' in group statement is ambiguous
+Warning	1052	Column 'a' in group statement is ambiguous
+drop table t;
+select 1 + "2 a";
+1 + "2 a"
+3
+Warnings:
+Warning	1292	Truncated incorrect DOUBLE value: '2 a'
+create table t (a int primary key, b blob default '');
+select a, (2*a) AS a from t group by a;
+a	a
+Warnings:
+Warning	1052	Column 'a' in group statement is ambiguous
+drop table t;