Commit 47cf24a1 authored by Gleb Shchepa's avatar Gleb Shchepa

merge from local tree to 5.1-bugteam

parents 566e3389 2f207e4a
...@@ -3758,8 +3758,6 @@ longlong Item_func_in::val_int() ...@@ -3758,8 +3758,6 @@ longlong Item_func_in::val_int()
return (longlong) (!null_value && tmp != negated); return (longlong) (!null_value && tmp != negated);
} }
if ((null_value= args[0]->null_value))
return 0;
have_null= 0; have_null= 0;
for (uint i= 1 ; i < arg_count ; i++) for (uint i= 1 ; i < arg_count ; i++)
{ {
...@@ -3769,6 +3767,8 @@ longlong Item_func_in::val_int() ...@@ -3769,6 +3767,8 @@ longlong Item_func_in::val_int()
if (!(value_added_map & (1 << (uint)cmp_type))) if (!(value_added_map & (1 << (uint)cmp_type)))
{ {
in_item->store_value(args[0]); in_item->store_value(args[0]);
if ((null_value= args[0]->null_value))
return 0;
value_added_map|= 1 << (uint)cmp_type; value_added_map|= 1 << (uint)cmp_type;
} }
if (!in_item->cmp(args[i]) && !args[i]->null_value) if (!in_item->cmp(args[i]) && !args[i]->null_value)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment