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

Merge commit '6b8802e8dd5467556a024d807a1df23940b00895' into bb-10.3-fix_len_dec

Browse Source
This commit is contained in:
Oleksandr Byelkin
2018-06-19 14:51:50 +02:00
parent 0121d5a790 6b8802e8dd
commit 083279f783
27 changed files with 892 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_select.cc
View File

@ -14034,7 +14034,8 @@ COND *Item_func_eq::build_equal_items(THD *thd,
List_iterator_fast<Item_equal> it(cond_equal.current_level);
while ((item_equal= it++))
{
item_equal->fix_length_and_dec();
if (item_equal->fix_length_and_dec())
return NULL;
item_equal->update_used_tables();
set_if_bigger(thd->lex->current_select->max_equal_elems,
item_equal->n_field_items());