revision-id: 5c580d74871a17d735c6a7594e667e7078263565 (mariadb-10.3.5-263-g5c580d7) parent(s): bbab52a2b5579faad252704f90621aab34e01101 author: Galina Shalygina committer: Galina Shalygina timestamp: 2018-05-06 21:51:22 +0200 message: Post merge changes --- sql/item.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sql/item.cc b/sql/item.cc index c367441..c350555 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -7704,6 +7704,7 @@ Item *Item::build_pushable_cond(THD *thd, return 0; List_iterator<Item> li(*((Item_cond*) this)->argument_list()); Item *item; + bool is_fix_needed= false; while ((item=li++)) { @@ -7718,9 +7719,16 @@ Item *Item::build_pushable_cond(THD *thd, return 0; if (!fix) continue; + + if (fix->type() == Item::COND_ITEM && + ((Item_cond*) fix)->functype() == Item_func::COND_AND_FUNC) + is_fix_needed= true; + if (new_cond->argument_list()->push_back(fix, thd->mem_root)) return 0; } + if (is_fix_needed) + new_cond->fix_fields(thd, 0); switch (new_cond->argument_list()->elements) {