Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions mysql-test/main/type_enum.result
Original file line number Diff line number Diff line change
Expand Up @@ -2616,4 +2616,17 @@ a b
2 N
drop table t1;
set sql_mode=default;
#
# MDEV-39043 ENUM can be set to empty string by giving an index value as string "0"
#
set sql_mode=STRICT_ALL_TABLES;
create table t1 (a enum('Value1', 'Value2') NOT NULL DEFAULT 'Value1');
insert into t1 values ('0');
Comment thread
HNOONa-0 marked this conversation as resolved.
ERROR 01000: Data truncated for column 'a' at row 1
insert into t1 values (0);
ERROR 01000: Data truncated for column 'a' at row 1
select * from t1;
a
drop table t1;
set sql_mode=default;
# End of 10.11 tests
Expand Down
13 changes: 13 additions & 0 deletions mysql-test/main/type_enum.test
Original file line number Diff line number Diff line change
Expand Up @@ -617,4 +617,17 @@ select * from t1;
drop table t1;
set sql_mode=default;

--echo #
--echo # MDEV-39043 ENUM can be set to empty string by giving an index value as string "0"
--echo #
set sql_mode=STRICT_ALL_TABLES;
create table t1 (a enum('Value1', 'Value2') NOT NULL DEFAULT 'Value1');
--error WARN_DATA_TRUNCATED
insert into t1 values ('0');
--error WARN_DATA_TRUNCATED
insert into t1 values (0);
select * from t1;
drop table t1;
set sql_mode=default;

--echo # End of 10.11 tests
Expand Down
2 changes: 1 addition & 1 deletion sql/field.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9455,7 +9455,7 @@ int Field_enum::store(const char *from,size_t length,CHARSET_INFO *cs)
/* This is for reading numbers with LOAD DATA INFILE */
char *end;
tmp=(uint) cs->strntoul(from,length,10,&end,&err);
if (err || end != from+length || tmp > typelib->count)
if (err || end != from+length || !tmp || tmp > typelib->count)
{
tmp=0;
set_warning(WARN_DATA_TRUNCATED, 1);
Expand Down