database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.4' into 10.5

Browse Source
This commit is contained in:
Sergei Golubchik
2023-12-01 13:43:58 +01:00
parent c6a9fd7904 5f89045221
commit 98a39b0c91
511 changed files with 26233 additions and 3853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_derived.cc
View File

@ -1334,13 +1334,10 @@ bool mysql_derived_reinit(THD *thd, LEX *lex, TABLE_LIST *derived)
(derived->alias.str ? derived->alias.str : "<NULL>"),
derived->get_unit()));
st_select_lex_unit *unit= derived->get_unit();
st_select_lex *sl= unit->first_select();
// reset item names to that saved after wildcard expansion in JOIN::prepare
do
{
for(st_select_lex *sl= unit->first_select(); sl; sl= sl->next_select())
sl->restore_item_list_names();
} while ((sl= sl->next_select()));
derived->merged_for_insert= FALSE;
unit->unclean();