diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-06-19 14:51:50 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-06-19 14:51:50 +0200 |
| commit | 083279f7838d45c475344d20585ead72a147a21d (patch) | |
| tree | c3ff5b3f6af1c9009b35d9b2560a7073be41ce90 /sql/sql_select.cc | |
| parent | 0121d5a790983c08dabedc66e70f862e47f7c8c7 (diff) | |
| parent | 6b8802e8dd5467556a024d807a1df23940b00895 (diff) | |
| download | mariadb-git-bb-10.3-fix_len_dec.tar.gz | |
Merge commit '6b8802e8dd5467556a024d807a1df23940b00895' into bb-10.3-fix_len_decbb-10.3-fix_len_dec
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 54bb877ea2f..73bd29642ef 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -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()); |