database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

post-merge fix

Browse Source
This commit is contained in:
unknown
2006-03-30 09:13:25 +05:00
parent a7431720ce
commit 600a17635e
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/create.result
View File

@ -747,7 +747,7 @@ t2 CREATE TABLE `t2` (
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1, t2; drop table t1, t2;
create table t1(a set("a,b","c,d") not null); 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; create table t1 (i int) engine=myisam max_rows=100000000000;
show create table t1; show create table t1;
Table Create Table Table Create Table

2
mysql-test/t/create.test
View File

@ -649,7 +649,7 @@ drop table t1, t2;
# #
# Bug #15316 SET value having comma not correctly handled # Bug #15316 SET value having comma not correctly handled
# #
--error 1105 --error 1367
create table t1(a set("a,b","c,d") not null); create table t1(a set("a,b","c,d") not null);
# End of 4.1 tests # End of 4.1 tests

4
sql/sql_table.cc
View File

@ -770,9 +770,7 @@ static int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info,
interval->type_lengths[i], interval->type_lengths[i],
comma_buf, comma_length, NULL, 0)) comma_buf, comma_length, NULL, 0))
{ {
my_printf_error(ER_UNKNOWN_ERROR, my_error(ER_ILLEGAL_VALUE_FOR_TYPE, MYF(0), "set", tmp->ptr());
"Illegal %s '%-.64s' value found during parsing",
MYF(0), "set", tmp->ptr());
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
} }