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.

1 files changed, 17 insertions, 0 deletions

diff --git a/mysql-test/t/partition_mgm.test b/mysql-test/t/partition_mgm.test
index 39512de154f..f1a89b28443 100644
--- a/mysql-test/t/partition_mgm.test
+++ b/mysql-test/t/partition_mgm.test
@@ -2,6 +2,23 @@
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 --enable_warnings
+
+#
+# Bug 21143: mysqld hang when error in number of subparts in
+#            REORGANIZE command
+#
+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));
+
+-- error ER_PARTITION_WRONG_NO_SUBPART_ERROR
+alter table t1 reorganize partition p0 into
+(partition p0 values less than (10) (subpartition sp00,
+subpartition sp01, subpartition sp02));
+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;