diff options
| author | unknown <gluh@eagle.intranet.mysql.r18.ru> | 2006-03-30 09:13:25 +0500 |
|---|---|---|
| committer | unknown <gluh@eagle.intranet.mysql.r18.ru> | 2006-03-30 09:13:25 +0500 |
| commit | 600a17635e2e9eeeaf10e4eb1520b1af7e285c4c (patch) | |
| tree | 6b468fd83890428ff2347883afcd66a23f8f3ea7 /mysql-test | |
| parent | a7431720ce85073aae45c06d4531c581be34d974 (diff) | |
| download | mariadb-git-600a17635e2e9eeeaf10e4eb1520b1af7e285c4c.tar.gz | |
post-merge fix
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/create.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/create.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index c11160c6727..27a6c8a9d03 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -747,7 +747,7 @@ t2 CREATE TABLE `t2` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1, t2; create table t1(a set("a,b","c,d") not null); -ERROR HY000: Illegal set 'a,b' value found during parsing +ERROR 22007: Illegal set 'a,b' value found during parsing create table t1 (i int) engine=myisam max_rows=100000000000; show create table t1; Table Create Table diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test index f647e7461a7..e22c2b5c426 100644 --- a/mysql-test/t/create.test +++ b/mysql-test/t/create.test @@ -649,7 +649,7 @@ drop table t1, t2; # # Bug #15316 SET value having comma not correctly handled # ---error 1105 +--error 1367 create table t1(a set("a,b","c,d") not null); # End of 4.1 tests |