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, 10 insertions, 0 deletions

diff --git a/mysql-test/r/partition_mgm.result b/mysql-test/r/partition_mgm.result
index f64ffaff495..9b5a34bda50 100644
--- a/mysql-test/r/partition_mgm.result
+++ b/mysql-test/r/partition_mgm.result
@@ -1,4 +1,14 @@
 DROP TABLE IF EXISTS t1;
+create table t1 (a int)
+partition by range (a)
+subpartition by key (a)
+(partition p0 values less than (10) (subpartition sp00, subpartition sp01),
+partition p1 values less than (20) (subpartition sp10, subpartition sp11));
+alter table t1 reorganize partition p0 into
+(partition p0 values less than (10) (subpartition sp00,
+subpartition sp01, subpartition sp02));
+ERROR HY000: Wrong number of subpartitions defined, mismatch with previous setting
+drop table t1;
 CREATE TABLE t1 (f_date DATE, f_varchar VARCHAR(30))
 PARTITION BY HASH(CAST(YEAR(f_date) AS SIGNED INTEGER)) PARTITIONS 2;
 SHOW CREATE TABLE t1;