Merge 10.1 into 10.2

1 files changed, 16 insertions, 0 deletions

diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 9e72278db8d..1b426f80a88 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -6634,6 +6634,12 @@ static bool fill_alter_inplace_info(THD *thd,
   KEY *new_key;
   KEY *new_key_end=
     ha_alter_info->key_info_buffer + ha_alter_info->key_count;
+  /*
+    Primary key index for the new table
+  */
+  const KEY* const new_pk= (ha_alter_info->key_count > 0 &&
+                            is_candidate_key(ha_alter_info->key_info_buffer)) ?
+                           ha_alter_info->key_info_buffer : NULL;
 
   DBUG_PRINT("info", ("index count old: %d  new: %d",
                       table->s->keys, ha_alter_info->key_count));
@@ -6709,6 +6715,16 @@ static bool fill_alter_inplace_info(THD *thd,
         goto index_changed;
     }
 
+    /*
+      Rebuild the index if following condition get satisfied:
+
+      (i) Old table doesn't have primary key, new table has it and vice-versa
+      (ii) Primary key changed to another existing index
+    */
+    if ((new_key == new_pk) !=
+        ((uint) (table_key - table->key_info) == table->s->primary_key))
+      goto index_changed;
+
     /* Check that key comment is not changed. */
     if (table_key->comment.length != new_key->comment.length ||
         (table_key->comment.length &&