mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-23 00:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.3 into 10.4

Browse source
This commit is contained in:
Marko Mäkelä 2018-11-06 16:24:16 +02:00
commit 074c684099
394 changed files with 28433 additions and 14888 deletions
Download patch file Download diff file Expand all files Collapse all files

15
sql/item_cmpfunc.cc
View file

@ -4231,12 +4231,21 @@ bool Item_func_in::value_list_convert_const_to_int(THD *thd)
if (field_item->field_type() == MYSQL_TYPE_LONGLONG ||
field_item->field_type() == MYSQL_TYPE_YEAR)
{
bool all_converted= TRUE;
bool all_converted= true;
Item **arg, **arg_end;
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)
m_comparator.set_handler(&type_handler_longlong);