Merge branch '10.1' into 10.2

1 files changed, 13 insertions, 1 deletions

diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
index ed23d9cccd6..bc5b9bde8e8 100644
--- a/sql/sql_admin.cc
+++ b/sql/sql_admin.cc
@@ -380,7 +380,19 @@ static bool open_only_one_table(THD* thd, TABLE_LIST* table,
   }
   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;
 
   return open_error;