Skip to content

M
MariaDB
Commit a472237d authored by Sergei Golubchik's avatar Sergei Golubchik Committed by Oleksandr Byelkin
Browse files
Options

followup: fix ASAN failure of main.opt_tvc --ps

parent 09c42536
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 9 deletions
sql/sql_tvc.cc
View file @ a472237d
...@@ -1173,12 +1173,10 @@ bool JOIN::transform_in_predicates_into_in_subq(THD *thd) ...@@ -1173,12 +1173,10 @@ bool JOIN::transform_in_predicates_into_in_subq(THD *thd)
{ {
select_lex->parsing_place= IN_WHERE; select_lex->parsing_place= IN_WHERE;
conds= conds=
conds->transform(thd, conds->top_level_transform(thd,
&Item::in_predicate_to_in_subs_transformer, &Item::in_predicate_to_in_subs_transformer, 0);
(uchar*) 0);
if (!conds) if (!conds)
DBUG_RETURN(true); DBUG_RETURN(true);
select_lex->prep_where= conds ? conds->copy_andor_structure(thd) : 0;
select_lex->where= conds; select_lex->where= conds;
} }
...@@ -1193,13 +1191,10 @@ bool JOIN::transform_in_predicates_into_in_subq(THD *thd) ...@@ -1193,13 +1191,10 @@ bool JOIN::transform_in_predicates_into_in_subq(THD *thd)
if (table->on_expr) if (table->on_expr)
{ {
table->on_expr= table->on_expr=
table->on_expr->transform(thd, table->on_expr->top_level_transform(thd,
&Item::in_predicate_to_in_subs_transformer, &Item::in_predicate_to_in_subs_transformer, 0);
(uchar*) 0);
if (!table->on_expr) if (!table->on_expr)
DBUG_RETURN(true); DBUG_RETURN(true);
table->prep_on_expr= table->on_expr ?
table->on_expr->copy_andor_structure(thd) : 0;
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7