BUG#21143: mysqld hangs when using wrong number of subpartitions

Rewrote if-statement a bit shorter
Added check for subpartitions in REORGANIZE partitions to be of same number as
in base table.


mysql-test/r/partition_mgm.result:
  New test case
mysql-test/t/partition_mgm.test:
  New test case
sql/ha_partition.cc:
  Fixed stuff I should done long ago (monty comments)
sql/sql_partition.cc:
  Rewrote if-statement a bit shorter
  Added check for subpartitions in REORGANIZE partitions to be of same number as
  in base table.

1 files changed, 2 insertions, 4 deletions

diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index 615c4bfb1bf..60e838bc243 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -5145,13 +5145,12 @@ void ha_partition::print_error(int error, myf errflag)
   DBUG_ENTER("ha_partition::print_error");
 
   /* Should probably look for my own errors first */
-  /* monty: needs to be called for the last used partition ! */
   DBUG_PRINT("enter", ("error: %d", error));
 
   if (error == HA_ERR_NO_PARTITION_FOUND)
     m_part_info->print_no_partition_found(table);
   else
-    m_file[0]->print_error(error, errflag);
+    m_file[m_last_part]->print_error(error, errflag);
   DBUG_VOID_RETURN;
 }
 
@@ -5161,8 +5160,7 @@ bool ha_partition::get_error_message(int error, String *buf)
   DBUG_ENTER("ha_partition::get_error_message");
 
   /* Should probably look for my own errors first */
-  /* monty: needs to be called for the last used partition ! */
-  DBUG_RETURN(m_file[0]->get_error_message(error, buf));
+  DBUG_RETURN(m_file[m_last_part]->get_error_message(error, buf));
 }