diff options
| author | unknown <sergefp@mysql.com> | 2005-03-15 09:29:54 +0300 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-03-15 09:29:54 +0300 |
| commit | 54baac55b6980038dcf581a1adc932164e29f437 (patch) | |
| tree | 740b964ca0c2898069ad57d27bb11bb23cb22257 /mysql-test/r/ansi.result | |
| parent | 897849e5d8802ebe6a42803cba72caa80cd23415 (diff) | |
| parent | 155cfb394280cc2501fda2bffcec7b73fd92582c (diff) | |
| download | mariadb-git-54baac55b6980038dcf581a1adc932164e29f437.tar.gz | |
Merge mysql.com:/home/psergey/mysql-4.1-bug8510
into mysql.com:/home/psergey/mysql-5.0-bug8510
mysql-test/r/ansi.result:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/ansi.result')
| -rw-r--r-- | mysql-test/r/ansi.result | 4 |
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=""; |