test fixed

mysql-test/r/partition_innodb.result:
  result fixed
mysql-test/t/partition_innodb.test:
  number of subpartitions fixed

mysql-test/r/partition_innodb.result

@@ -137,14 +137,15 @@ COUNT(*)
 2
 DROP TABLE t1;
 create table t1 (int_column int, char_column char(5))
-PARTITION BY RANGE (int_column) subpartition by key (char_column)
+PARTITION BY RANGE (int_column) subpartition by key (char_column) subpartitions 2
 (PARTITION p1 VALUES LESS THAN (5) ENGINE = InnoDB);
-alter table t1 PARTITION BY RANGE (int_column) subpartition by key (char_column)
+alter table t1 PARTITION BY RANGE (int_column)
+subpartition by key (char_column) subpartitions 2
 (PARTITION p1 VALUES LESS THAN (5) ENGINE = myisam);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `int_column` int(11) DEFAULT NULL,
   `char_column` char(5) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (int_column) SUBPARTITION BY KEY (char_column) (PARTITION p1 VALUES LESS THAN (5) ENGINE = MyISAM) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (int_column) SUBPARTITION BY KEY (char_column) SUBPARTITIONS 2 (PARTITION p1 VALUES LESS THAN (5) ENGINE = MyISAM) */
 drop table t1;

mysql-test/t/partition_innodb.test

@@ -147,9 +147,10 @@ DROP TABLE t1;
 # Bug #31893 Partitions: crash if subpartitions and engine change
 #
 create table t1 (int_column int, char_column char(5))
-  PARTITION BY RANGE (int_column) subpartition by key (char_column)
+  PARTITION BY RANGE (int_column) subpartition by key (char_column) subpartitions 2
   (PARTITION p1 VALUES LESS THAN (5) ENGINE = InnoDB);
-alter table t1 PARTITION BY RANGE (int_column) subpartition by key (char_column)
+alter table t1 PARTITION BY RANGE (int_column)
+   subpartition by key (char_column) subpartitions 2
   (PARTITION p1 VALUES LESS THAN (5) ENGINE = myisam);
 show create table t1;
 drop table t1;