WL 2826: Error handling of ALTER TABLE for partitioning

Fixed merge issue


sql/sql_partition.cc:
  Added some debug printouts
sql/sql_table.cc:
  Fixed merge issue

sql/sql_partition.cc

@@ -4532,6 +4532,7 @@ the generated partition syntax in a correct manner.
           /*
             Make sure change of engine happens to all partitions.
           */
+          DBUG_PRINT("info", ("partition changed"));
           set_engine_all_partitions(thd->work_part_info, create_info->db_type);
           *partition_changed= TRUE;
         }
@@ -4546,7 +4547,10 @@ the generated partition syntax in a correct manner.
         using the partition handler.
       */
       if (thd->work_part_info != table->part_info)
+      {
+        DBUG_PRINT("info", ("partition changed"));
         *partition_changed= TRUE;
+      }
       if (create_info->db_type == &partition_hton)
         part_info->default_engine_type= table->part_info->default_engine_type;
       else

sql/sql_table.cc

@@ -5990,7 +5990,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
       VOID(pthread_mutex_lock(&LOCK_open));
     }
     /* Tell the handler that a new frm file is in place. */
-    if (table->file->create_handler_files(reg_path, NULL, CHF_INDEX_FLAG,
+    if (table->file->create_handler_files(path, NULL, CHF_INDEX_FLAG,
                                           create_info))
     {
       VOID(pthread_mutex_unlock(&LOCK_open));