diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-29 19:22:04 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-29 19:22:04 +0200 |
| commit | 1ebfa2af62246b98e17cd255a9ccd858151b355a (patch) | |
| tree | f9cf4670ebe96b46f8e0107acc31f7235ec4c554 /sql/sql_tvc.cc | |
| parent | dd9da61dcfd7f5e675ed876cf38886b29d0ddc57 (diff) | |
| parent | 64143741789a3e1c2bb8c6bf627eaec3751af0c6 (diff) | |
| download | mariadb-git-1ebfa2af62246b98e17cd255a9ccd858151b355a.tar.gz | |
Merge branch '10.6' into 10.7
Diffstat (limited to 'sql/sql_tvc.cc')
| -rw-r--r-- | sql/sql_tvc.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sql/sql_tvc.cc b/sql/sql_tvc.cc index a045d0e3908..6e6d446ce16 100644 --- a/sql/sql_tvc.cc +++ b/sql/sql_tvc.cc @@ -1173,12 +1173,10 @@ bool JOIN::transform_in_predicates_into_in_subq(THD *thd) { select_lex->parsing_place= IN_WHERE; conds= - conds->transform(thd, - &Item::in_predicate_to_in_subs_transformer, - (uchar*) 0); + conds->top_level_transform(thd, + &Item::in_predicate_to_in_subs_transformer, 0); if (!conds) DBUG_RETURN(true); - select_lex->prep_where= conds ? conds->copy_andor_structure(thd) : 0; select_lex->where= conds; } @@ -1193,13 +1191,10 @@ bool JOIN::transform_in_predicates_into_in_subq(THD *thd) if (table->on_expr) { table->on_expr= - table->on_expr->transform(thd, - &Item::in_predicate_to_in_subs_transformer, - (uchar*) 0); + table->on_expr->top_level_transform(thd, + &Item::in_predicate_to_in_subs_transformer, 0); if (!table->on_expr) DBUG_RETURN(true); - table->prep_on_expr= table->on_expr ? - table->on_expr->copy_andor_structure(thd) : 0; } } } |