summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-09-30 11:01:07 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-09-30 11:01:07 +0300
commitb36d6f92a865e519271925f68802d599e62cf26c (patch)
tree27c9bd08266f17aaa712d84f14bf41f657ad9fb3 /sql/sql_base.cc
parent8dd4794c4e11b8790fadf0c203bcd118e7b755e8 (diff)
parenta49e394399859b23ba609d0058b498cfa876cac4 (diff)
downloadmariadb-git-b36d6f92a865e519271925f68802d599e62cf26c.tar.gz
Merge 10.6 into 10.7
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r--sql/sql_base.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index a785197b282..e1221fb6f6e 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -6894,6 +6894,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;