diff options
| author | unknown <gluh@mysql.com/eagle.(none)> | 2007-12-13 15:47:23 +0400 |
|---|---|---|
| committer | unknown <gluh@mysql.com/eagle.(none)> | 2007-12-13 15:47:23 +0400 |
| commit | f1d980542233ac18d3e4acc6911b8adfc432bb09 (patch) | |
| tree | 4174a07e826d4e9df363cb8926487fd2f735250b /mysql-test | |
| parent | 4618000b89257c4c923af275d17a58fbfadbfd6e (diff) | |
| download | mariadb-git-f1d980542233ac18d3e4acc6911b8adfc432bb09.tar.gz | |
after merge fix
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/delayed.result | 16 | ||||
| -rw-r--r-- | mysql-test/r/func_misc.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/func_misc.test | 3 |
3 files changed, 2 insertions, 19 deletions
diff --git a/mysql-test/r/delayed.result b/mysql-test/r/delayed.result index e7ee23b3e2a..9f6ebea7e1b 100644 --- a/mysql-test/r/delayed.result +++ b/mysql-test/r/delayed.result @@ -109,20 +109,12 @@ c1 DROP TABLE t1; SET @@auto_increment_offset= @bug20627_old_auto_increment_offset; -Warnings: -Warning 1292 Truncated incorrect auto-increment-offset value: '0' SET @@auto_increment_increment= @bug20627_old_auto_increment_increment; -Warnings: -Warning 1292 Truncated incorrect auto-increment-increment value: '0' SET @@session.auto_increment_offset= @bug20627_old_session_auto_increment_offset; -Warnings: -Warning 1292 Truncated incorrect auto-increment-offset value: '0' SET @@session.auto_increment_increment= @bug20627_old_session_auto_increment_increment; -Warnings: -Warning 1292 Truncated incorrect auto-increment-increment value: '0' SET @bug20830_old_auto_increment_offset= @@auto_increment_offset; SET @bug20830_old_auto_increment_increment= @@ -245,20 +237,12 @@ SUM(c1) DROP TABLE t1; SET @@auto_increment_offset= @bug20830_old_auto_increment_offset; -Warnings: -Warning 1292 Truncated incorrect auto-increment-offset value: '0' SET @@auto_increment_increment= @bug20830_old_auto_increment_increment; -Warnings: -Warning 1292 Truncated incorrect auto-increment-increment value: '0' SET @@session.auto_increment_offset= @bug20830_old_session_auto_increment_offset; -Warnings: -Warning 1292 Truncated incorrect auto-increment-offset value: '0' SET @@session.auto_increment_increment= @bug20830_old_session_auto_increment_increment; -Warnings: -Warning 1292 Truncated incorrect auto-increment-increment value: '0' CREATE TABLE t1(a BIT); INSERT DELAYED INTO t1 VALUES(1); FLUSH TABLE t1; diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result index 4ba5ee674a9..4f6b6d3a0d8 100644 --- a/mysql-test/r/func_misc.result +++ b/mysql-test/r/func_misc.result @@ -210,7 +210,7 @@ test CREATE TABLE t1 (a int); INSERT INTO t1 VALUES (5), (2); SELECT NAME_CONST(x,2) FROM (SELECT a x FROM t1) t; -ERROR HY000: The 'NAME_CONST' syntax is reserved for purposes internal to the MySQL server +ERROR HY000: Incorrect arguments to NAME_CONST DROP TABLE t1; CREATE TABLE t1(a INT); INSERT INTO t1 VALUES (), (), (); diff --git a/mysql-test/t/func_misc.test b/mysql-test/t/func_misc.test index 82db9ddbd67..ccb59df5677 100644 --- a/mysql-test/t/func_misc.test +++ b/mysql-test/t/func_misc.test @@ -212,12 +212,11 @@ SELECT NAME_CONST('test', 'test'); CREATE TABLE t1 (a int); INSERT INTO t1 VALUES (5), (2); ---error ER_RESERVED_SYNTAX +--error ER_WRONG_ARGUMENTS SELECT NAME_CONST(x,2) FROM (SELECT a x FROM t1) t; DROP TABLE t1; ---echo End of 5.0 tests # # Bug #32559: connection hangs on query with name_const |