diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-29 16:03:02 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-29 16:03:02 +0300 |
commit | a10b63bf58795335b96281bfc22169c9b8613037 (patch) | |
tree | 09d4b117202c5df7985c84d6b5a30c4368dc6c72 /sql/item_subselect.cc | |
parent | 05abcd7e600ddc2dee280b000439ded2855ff772 (diff) | |
parent | f3bc4f49f7c02018cac2c721837f9d1f52e9fff0 (diff) | |
download | mariadb-git-a10b63bf58795335b96281bfc22169c9b8613037.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/item_subselect.cc')
-rw-r--r-- | sql/item_subselect.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 7a0c2b3a35c..82b40966e4f 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -5223,8 +5223,9 @@ bool subselect_hash_sj_engine::make_semi_join_conds() tmp_table_ref->init_one_table(&empty_clex_str, &table_name, NULL, TL_READ); tmp_table_ref->table= tmp_table; - context= new Name_resolution_context; + context= new (thd->mem_root) Name_resolution_context; context->init(); + context->select_lex= item_in->unit->first_select(); context->first_name_resolution_table= context->last_name_resolution_table= tmp_table_ref; semi_join_conds_context= context; |