summaryrefslogtreecommitdiff
path: root/mysql-test/r/ansi.result
diff options
context:
space:
mode:
authorsergefp@mysql.com <>2005-03-15 09:29:54 +0300
committersergefp@mysql.com <>2005-03-15 09:29:54 +0300
commit62465a98e27af7325bde9cb9fba7655a575fdc50 (patch)
tree740b964ca0c2898069ad57d27bb11bb23cb22257 /mysql-test/r/ansi.result
parent6a2ef5577c390abb576cef354d26d8a211f82d7c (diff)
parente7e2a8c8eb6c5dd0849c68444eb2674f324ed281 (diff)
downloadmariadb-git-62465a98e27af7325bde9cb9fba7655a575fdc50.tar.gz
Merge mysql.com:/home/psergey/mysql-4.1-bug8510
into mysql.com:/home/psergey/mysql-5.0-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 c515ee9a1e8..00a526df8ea 100644
--- a/mysql-test/r/ansi.result
+++ b/mysql-test/r/ansi.result
@@ -6,7 +6,7 @@ NO_FIELD_OPTIONS,MYSQL40,HIGH_NOT_PRECEDENCE
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="";