database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-09 08:01:34 +03:00
Code Activity

Merge tag 'mariadb-5.5.52' into 5.5-galera

Browse Source
This commit is contained in:
Nirbhay Choubey
2016-09-19 12:12:33 -04:00
parent d40d3f4e57 0da39cacee
commit 81c13acfb3
31 changed files with 274 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_admin.cc
View File

@@ -441,7 +441,19 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
}
thd->prepare_derived_at_open= FALSE;
table->next_global= save_next_global;
/*
MERGE engine may adjust table->next_global chain, thus we have to
append save_next_global after merge children.
*/
if (save_next_global)
{
TABLE_LIST *table_list_iterator= table;
while (table_list_iterator->next_global)
table_list_iterator= table_list_iterator->next_global;
table_list_iterator->next_global= save_next_global;
save_next_global->prev_global= &table_list_iterator->next_global;
}
table->next_local= save_next_local;
thd->open_options&= ~extra_open_options;