diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-30 09:04:43 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-30 09:04:43 +0300 |
| commit | 064cb58efea063595e336e4cd0feccb12d26f8cf (patch) | |
| tree | f140b96c8a20172cbb484375e38a7aa481ab660b /sql/sql_base.cc | |
| parent | e5a9dcfda20e174525ad63a30e12f592aa9c96d3 (diff) | |
| parent | 57fdd016ce6167c15ba9cd41048b8a42ba582447 (diff) | |
| download | mariadb-git-064cb58efea063595e336e4cd0feccb12d26f8cf.tar.gz | |
Merge 10.4 into 10.5
FIXME: Part of the MDEV-20699 test is disabled due to
nonderterministic result.
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 2744a2ce71a..1e6bf3f0213 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -6828,6 +6828,7 @@ set_new_item_local_context(THD *thd, Item_ident *item, TABLE_LIST *table_ref) if (!(context= new (thd->mem_root) Name_resolution_context)) return TRUE; context->init(); + context->select_lex= table_ref->select_lex; context->first_name_resolution_table= context->last_name_resolution_table= table_ref; item->context= context; |