1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-17257 Server crashes in Item::field_type_for_temporal_comparison or in get_datetime_value on SELECT with YEAR field and IN

Browse Source
This commit is contained in:
Alexander Barkov 2018-10-17 08:26:13 +04:00
parent 853dee854c
commit 8e716138ce
3 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/r/type_year.result
View File

@ -394,3 +394,16 @@ select a from t1 where a=b;
a a
drop table t1; drop table t1;
drop function y2k; drop function y2k;
#
# Start of 10.0 tests
#
#
# MDEV-17257 Server crashes in Item::field_type_for_temporal_comparison or in get_datetime_value on SELECT with YEAR field and IN
#
CREATE TABLE t1 (y YEAR);
SELECT * FROM t1 WHERE y IN ( CAST( '1993-03-26 10:14:20' AS DATE ), NULL );
y
DROP TABLE t1;
#
# End of 10.0 tests
#

16
mysql-test/t/type_year.test
View File

@ -188,3 +188,19 @@ drop table t1;
drop function y2k; drop function y2k;
--echo #
--echo # Start of 10.0 tests
--echo #
--echo #
--echo # MDEV-17257 Server crashes in Item::field_type_for_temporal_comparison or in get_datetime_value on SELECT with YEAR field and IN
--echo #
CREATE TABLE t1 (y YEAR);
SELECT * FROM t1 WHERE y IN ( CAST( '1993-03-26 10:14:20' AS DATE ), NULL );
DROP TABLE t1;
--echo #
--echo # End of 10.0 tests
--echo #

15
sql/item_cmpfunc.cc
View File

@ -4172,11 +4172,20 @@ void Item_func_in::fix_length_and_dec()
if (field_item->field_type() == MYSQL_TYPE_LONGLONG || if (field_item->field_type() == MYSQL_TYPE_LONGLONG ||
field_item->field_type() == MYSQL_TYPE_YEAR) field_item->field_type() == MYSQL_TYPE_YEAR)
{ {
bool all_converted= TRUE; bool all_converted= true;
for (arg=args+1, arg_end=args+arg_count; arg != arg_end ; arg++) for (arg=args+1, arg_end=args+arg_count; arg != arg_end ; arg++)
{ {
if (!convert_const_to_int(thd, field_item, &arg[0])) /*
all_converted= FALSE; Explicit NULLs should not affect data cmp_type resolution:
- we ignore NULLs when calling collect_cmp_type()
- we ignore NULLs here
So this expression:
year_column IN (DATE'2001-01-01', NULL)
switches from TIME_RESULT to INT_RESULT.
*/
if (arg[0]->type() != Item::NULL_ITEM &&
!convert_const_to_int(thd, field_item, &arg[0]))
all_converted= false;
} }
if (all_converted) if (all_converted)
cmp_type= INT_RESULT; cmp_type= INT_RESULT;