diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-29 15:04:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-29 15:04:20 +0300 |
| commit | 742b37a345343c26451b35e97bfb3eb23410a075 (patch) | |
| tree | a24a16890184cc48fc78bb0b99627378b5f9efef /sql/item_subselect.cc | |
| parent | 4e9366df7b097ae38db8ead75a4f4e5d58ad8dca (diff) | |
| parent | b2a5e0f28232b56c5c36e65a457d41d819b279bf (diff) | |
| download | mariadb-git-742b37a345343c26451b35e97bfb3eb23410a075.tar.gz | |
Merge 10.2 into 10.3
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 352d80da92c..6533ef459a7 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -5186,8 +5186,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; |