diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-11-01 10:42:22 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-11-01 11:55:28 +0100 |
| commit | 49a22c5897823c528d52886f6048d5b4c91e221f (patch) | |
| tree | 92eedca678276458a7c4e27f357acd12d4fdcbac /sql/sql_lex.cc | |
| parent | 8e6a64194b76a199b0bbf2edc9a4e9facda8da2c (diff) | |
| parent | ebf2121529fcf06971b4c0fc28f40654ef8dd99f (diff) | |
| download | mariadb-git-49a22c5897823c528d52886f6048d5b4c91e221f.tar.gz | |
Merge branch '10.9' into 10.10
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 2c91b4cc9c6..5e9d9a8eb17 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -2925,6 +2925,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(); @@ -10862,9 +10863,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 && |