diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-10-08 18:53:31 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-10-08 18:53:31 +0300 |
| commit | 32747b19de5c6a4a78ecf65378c8268823a3b4ca (patch) | |
| tree | 91c3c750d9a03c42d9da0b2335928ae4a162e4ea /mysql-test/r/ansi.result | |
| parent | 69ea87fe312be473401dc3fb1c6756a72b86881a (diff) | |
| download | mariadb-git-32747b19de5c6a4a78ecf65378c8268823a3b4ca.tar.gz | |
Fixed bug in error handling of CREATE ... SELECT
More tests cases
After merge fixes
BitKeeper/deleted/.del-ansi-master.opt~4d337eb61642a838:
Delete: mysql-test/t/ansi-master.opt
mysql-test/r/ansi.result:
Cleaned up test to be able to remove ansi-master.opt
mysql-test/r/create.result:
Updated results
mysql-test/r/insert_select.result:
Updated results
mysql-test/r/rpl000009.result:
Updated results
mysql-test/t/ansi.test:
Cleaned up test to be able to remove ansi-master.opt
mysql-test/t/create.test:
More tests
mysql-test/t/insert_select.test:
More tests
mysql-test/t/mysqlbinlog.test:
Fixed test after merge
sql/mysql_priv.h:
Added character-sets-dir to 'show variables'
sql/set_var.cc:
Added character-sets-dir to 'show variables'
sql/sql_class.cc:
Fixed that send_error() is called properly when a SELECT fails
sql/sql_class.h:
Fixed that send_error() is called properly when a SELECT fails
sql/sql_insert.cc:
Fixed bug in error handling of CREATE ... SELECT
sql/sql_select.cc:
Fixed bug in error handling of CREATE ... SELECT
Diffstat (limited to 'mysql-test/r/ansi.result')
| -rw-r--r-- | mysql-test/r/ansi.result | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/mysql-test/r/ansi.result b/mysql-test/r/ansi.result index 6ec909f84bb..0b86634f67b 100644 --- a/mysql-test/r/ansi.result +++ b/mysql-test/r/ansi.result @@ -1,4 +1,12 @@ drop table if exists t1; +set sql_mode="MySQL40"; +select @@sql_mode; +@@sql_mode +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 SELECT 'A' || 'B'; 'A' || 'B' AB @@ -8,11 +16,4 @@ id NULL 1 1.1 a SELECT id FROM t1 GROUP BY id2; ERROR 42000: 'test.t1.id' isn't in GROUP BY drop table t1; -set sql_mode="MySQL40"; -select @@sql_mode; -@@sql_mode -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 +SET @@SQL_MODE=""; |