summaryrefslogtreecommitdiff
path: root/mysql-test/r/ansi.result
diff options
context:
space:
mode:
authorsergefp@mysql.com <>2005-03-15 04:09:41 +0300
committersergefp@mysql.com <>2005-03-15 04:09:41 +0300
commite7e2a8c8eb6c5dd0849c68444eb2674f324ed281 (patch)
treed1d0f3a9d3b2b337a002448565e55b435ff103a1 /mysql-test/r/ansi.result
parent9ec8d87328876cf1337d1cf7b2845c9b0ee0c9da (diff)
parent3724e8e0b4ab12974389730494f9dc2b298be0d0 (diff)
downloadmariadb-git-e7e2a8c8eb6c5dd0849c68444eb2674f324ed281.tar.gz
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug8510
Diffstat (limited to 'mysql-test/r/ansi.result')
-rw-r--r--mysql-test/r/ansi.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/ansi.result b/mysql-test/r/ansi.result
index 0b86634f67b..212d28f918b 100644
--- a/mysql-test/r/ansi.result
+++ b/mysql-test/r/ansi.result
@@ -6,7 +6,7 @@ NO_FIELD_OPTIONS,MYSQL40
set @@sql_mode="ANSI";
select @@sql_mode;
@@sql_mode
-REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ONLY_FULL_GROUP_BY,ANSI
+REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI
SELECT 'A' || 'B';
'A' || 'B'
AB
@@ -14,6 +14,6 @@ CREATE TABLE t1 (id INT, id2 int);
SELECT id,NULL,1,1.1,'a' FROM t1 GROUP BY id;
id NULL 1 1.1 a
SELECT id FROM t1 GROUP BY id2;
-ERROR 42000: 'test.t1.id' isn't in GROUP BY
+id
drop table t1;
SET @@SQL_MODE="";