diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
| commit | 76f0b94bb0b2994d639353530c5b251d0f1a204b (patch) | |
| tree | 9ed50628aac34f89a37637bab2fc4915b86b5eb4 /mysql-test/r/plugin.result | |
| parent | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff) | |
| parent | 5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff) | |
| download | mariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz | |
merge with 5.3
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
Diffstat (limited to 'mysql-test/r/plugin.result')
| -rw-r--r-- | mysql-test/r/plugin.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/plugin.result b/mysql-test/r/plugin.result index 73f1779badc..7c89beb9725 100644 --- a/mysql-test/r/plugin.result +++ b/mysql-test/r/plugin.result @@ -61,7 +61,7 @@ select @@global.example_ulong_var; 500 set session sql_mode=@old_sql_mode; set session old=bla; -ERROR HY000: Variable 'old' is a read only variable +ERROR 42000: Variable 'old' can't be set to the value of 'bla' #legal values CREATE TABLE t1 ( a int complex='c,f,f,f' ) ENGINE=example ULL=10000 STR='dskj' one_or_two='one' YESNO=0; show create table t1; @@ -75,9 +75,9 @@ SET SQL_MODE='IGNORE_BAD_TABLE_OPTIONS'; #illegal value fixed CREATE TABLE t1 (a int) ENGINE=example ULL=10000000000000000000 one_or_two='ttt' YESNO=SSS; Warnings: -Warning 1723 Incorrect value '10000000000000000000' for option 'ULL' -Warning 1723 Incorrect value 'ttt' for option 'one_or_two' -Warning 1723 Incorrect value 'SSS' for option 'YESNO' +Warning 1912 Incorrect value '10000000000000000000' for option 'ULL' +Warning 1912 Incorrect value 'ttt' for option 'one_or_two' +Warning 1912 Incorrect value 'SSS' for option 'YESNO' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( |