diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-29 12:59:18 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-29 12:59:18 +0300 |
commit | d62b0368ca53cc10b45b703bbeefcf0b674bd39d (patch) | |
tree | e65926bf20605d24a87619553374a74e7ef1c2c8 /sql/item_cmpfunc.cc | |
parent | 9d6d1221230e2acf9fac2ab6fe685c0a2a7845aa (diff) | |
parent | 088b37b5eaa8c3198c7f8ea0358d15135833f6bb (diff) | |
download | mariadb-git-d62b0368ca53cc10b45b703bbeefcf0b674bd39d.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/item_cmpfunc.cc')
-rw-r--r-- | sql/item_cmpfunc.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index ddabdaaff53..ae798913163 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -4719,10 +4719,11 @@ void Item_func_in::mark_as_condition_AND_part(TABLE_LIST *embedding) Query_arena *arena, backup; arena= thd->activate_stmt_arena_if_needed(&backup); - if (to_be_transformed_into_in_subq(thd)) + if (!transform_into_subq_checked) { - transform_into_subq= true; - thd->lex->current_select->in_funcs.push_back(this, thd->mem_root); + if ((transform_into_subq= to_be_transformed_into_in_subq(thd))) + thd->lex->current_select->in_funcs.push_back(this, thd->mem_root); + transform_into_subq_checked= true; } if (arena) |