diff options
| -rw-r--r-- | mysql-test/r/create.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/create.test | 2 | ||||
| -rw-r--r-- | sql/sql_table.cc | 4 |
3 files changed, 3 insertions, 5 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 diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 8f13e612050..0fd0c8e25e1 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -770,9 +770,7 @@ static int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info, interval->type_lengths[i], comma_buf, comma_length, NULL, 0)) { - my_printf_error(ER_UNKNOWN_ERROR, - "Illegal %s '%-.64s' value found during parsing", - MYF(0), "set", tmp->ptr()); + my_error(ER_ILLEGAL_VALUE_FOR_TYPE, MYF(0), "set", tmp->ptr()); DBUG_RETURN(-1); } } |