diff options
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index b98d4a62c55..57f7cfac595 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -2951,6 +2951,7 @@ void st_select_lex::init_query() min_max_opt_list.empty(); limit_params.clear(); join= 0; + cur_pos_in_select_list= UNDEF_POS; having= prep_having= where= prep_where= 0; cond_pushed_into_where= cond_pushed_into_having= 0; attach_to_conds.empty(); @@ -10872,9 +10873,8 @@ st_select_lex::build_pushable_cond_for_having_pushdown(THD *thd, Item *cond) */ if (cond->get_extraction_flag() == MARKER_FULL_EXTRACTION) { - Item *result= cond->transform(thd, - &Item::multiple_equality_transformer, - (uchar *)this); + Item *result= cond->top_level_transform(thd, + &Item::multiple_equality_transformer, (uchar *)this); if (!result) return true; if (result->type() == Item::COND_ITEM && |