1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge 10.4 into 10.5

FIXME: Part of the MDEV-20699 test is disabled due to
nonderterministic result.
This commit is contained in:
Marko Mäkelä
2021-09-30 09:04:43 +03:00
34 changed files with 483 additions and 288 deletions

View File

@ -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;