cleanup: remove Item::intro_version

and partition_info::set_show_version_string - they were
already broken and impossible to maintain

mysql-test/r/ctype_uca_partitions.result

@@ -6,8 +6,8 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varchar(10) CHARACTER SET utf8 COLLATE utf8_thai_520_w2 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 INSERT INTO t1 VALUES ('A'),('À'),('Á'),('Â'),('Ã'),('Ä'),('Å');
 INSERT INTO t1 VALUES ('B');
 INSERT INTO t1 VALUES ('C');

mysql-test/r/information_schema_part.result

@@ -120,9 +120,9 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 SUBPARTITION BY LINEAR HASH (a)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM) */
+(PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM)
 select SUBPARTITION_METHOD FROM information_schema.partitions WHERE
 table_schema="test" AND table_name="t1";
 SUBPARTITION_METHOD
@@ -138,8 +138,8 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53) ENGINE = MyISAM) */
+(PARTITION p0 VALUES IN (10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53) ENGINE = MyISAM)
 SELECT PARTITION_DESCRIPTION FROM information_schema.partitions WHERE
 table_schema = "test" AND table_name = "t1";
 PARTITION_DESCRIPTION

mysql-test/r/partition.result

@@ -94,8 +94,8 @@ t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL,
   `b` int(11) NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1;
 a	b
 0	1
@@ -187,12 +187,12 @@ t1	CREATE TABLE `t1` (
   `new_field0` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`ID`,`aaaa,aaaaa`,`ddddddddd`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (ID)
+ PARTITION BY RANGE (ID)
 SUBPARTITION BY LINEAR KEY (`ID`,`aaaa,aaaaa`)
 SUBPARTITIONS 2
 (PARTITION p01 VALUES LESS THAN (100) ENGINE = MyISAM,
  PARTITION p11 VALUES LESS THAN (200) ENGINE = MyISAM,
- PARTITION p21 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p21 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 drop table t1;
 CREATE TABLE t1 (a INT, b INT)
 PARTITION BY LIST (a)
@@ -264,10 +264,10 @@ t1	CREATE TABLE `t1` (
   `b` varchar(10) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (UNIX_TIMESTAMP(a))
+ PARTITION BY RANGE (UNIX_TIMESTAMP(a))
 (PARTITION p1 VALUES LESS THAN (1199134800) ENGINE = MyISAM,
  PARTITION p3 VALUES LESS THAN (1247688000) ENGINE = MyISAM,
- PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 DROP TABLE t1;
 create table t1 (a int NOT NULL, b varchar(5) NOT NULL)
 default charset=utf8
@@ -376,9 +376,9 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
 (PARTITION p0 ENGINE = MEMORY,
- PARTITION p1 ENGINE = MEMORY) */
+ PARTITION p1 ENGINE = MEMORY)
 DROP TABLE t1;
 SET sql_mode=DEFAULT;
 CREATE TABLE t1 (a INT NOT NULL, KEY(a))
@@ -775,20 +775,20 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 SUBPARTITION BY KEY (a)
 (PARTITION p0 VALUES LESS THAN (1) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN (2) ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN (2) ENGINE = MyISAM)
 alter table t1 reorganize partition p1 into (partition p1 values less than (3));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 SUBPARTITION BY KEY (a)
 (PARTITION p0 VALUES LESS THAN (1) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN (3) ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN (3) ENGINE = MyISAM)
 drop table t1;
 CREATE TABLE t1 (
 a int not null,
@@ -807,7 +807,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) NOT NULL,
   PRIMARY KEY (`a`,`b`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a) */
+ PARTITION BY KEY (a)
 drop table t1;
 CREATE TABLE t1 (
 a int not null,
@@ -985,8 +985,8 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
-(PARTITION x1 VALUES IN (1) ENGINE = MEMORY) */
+(PARTITION x1 VALUES IN (1) ENGINE = MEMORY)
 drop table t1;
 CREATE TABLE t1 (a int, unique(a))
 PARTITION BY LIST (a)
@@ -1011,8 +1011,8 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
-PARTITIONS 5 */
+PARTITIONS 5
 drop table t1;
 CREATE TABLE t1 (a int)
 PARTITION BY RANGE (a)
@@ -1040,10 +1040,10 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION p1 VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = MyISAM) */
+ PARTITION p2 VALUES LESS THAN (30) ENGINE = MyISAM)
 drop table t1;
 CREATE TABLE t1 (a int, b int)
 PARTITION BY RANGE (a)
@@ -1065,7 +1065,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION x1 VALUES LESS THAN (6) ENGINE = MyISAM,
  PARTITION x3 VALUES LESS THAN (8) ENGINE = MyISAM,
  PARTITION x4 VALUES LESS THAN (10) ENGINE = MyISAM,
@@ -1073,7 +1073,7 @@ t1	CREATE TABLE `t1` (
  PARTITION x6 VALUES LESS THAN (14) ENGINE = MyISAM,
  PARTITION x7 VALUES LESS THAN (16) ENGINE = MyISAM,
  PARTITION x8 VALUES LESS THAN (18) ENGINE = MyISAM,
- PARTITION x9 VALUES LESS THAN (20) ENGINE = MyISAM) */
+ PARTITION x9 VALUES LESS THAN (20) ENGINE = MyISAM)
 drop table t1;
 create table t1 (a int not null, b int not null) partition by LIST (a+b) (
 partition p0 values in (12),
@@ -1128,36 +1128,36 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION p0 ENGINE = MyISAM,
- PARTITION p1 ENGINE = MyISAM) */
+ PARTITION p1 ENGINE = MyISAM)
 alter table t1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION p0 ENGINE = MyISAM,
- PARTITION p1 ENGINE = MyISAM) */
+ PARTITION p1 ENGINE = MyISAM)
 alter table t1 engine=myisam;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION p0 ENGINE = MyISAM,
- PARTITION p1 ENGINE = MyISAM) */
+ PARTITION p1 ENGINE = MyISAM)
 alter table t1 engine=heap;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION p0 ENGINE = MEMORY,
- PARTITION p1 ENGINE = MEMORY) */
+ PARTITION p1 ENGINE = MEMORY)
 alter table t1 remove partitioning;
 show create table t1;
 Table	Create Table
@@ -1175,9 +1175,9 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION p0 ENGINE = MyISAM,
- PARTITION p1 ENGINE = MyISAM) */
+ PARTITION p1 ENGINE = MyISAM)
 alter table t1 add column b int remove partitioning;
 show create table t1;
 Table	Create Table
@@ -1195,9 +1195,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION p0 ENGINE = MyISAM,
- PARTITION p1 ENGINE = MyISAM) */
+ PARTITION p1 ENGINE = MyISAM)
 alter table t1
 engine=heap
 partition by key(a)
@@ -1208,9 +1208,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION p0 ENGINE = MEMORY,
- PARTITION p1 ENGINE = MEMORY) */
+ PARTITION p1 ENGINE = MEMORY)
 alter table t1 engine=myisam, add column c int remove partitioning;
 show create table t1;
 Table	Create Table
@@ -1230,9 +1230,9 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION p0 ENGINE = MEMORY,
- PARTITION p1 ENGINE = MEMORY) */
+ PARTITION p1 ENGINE = MEMORY)
 alter table t1
 partition by key (a)
 (partition p0, partition p1);
@@ -1243,9 +1243,9 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION p0 ENGINE = MEMORY,
- PARTITION p1 ENGINE = MEMORY) */
+ PARTITION p1 ENGINE = MEMORY)
 alter table t1
 engine=heap
 partition by key (a)
@@ -1257,9 +1257,9 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION p0 ENGINE = MEMORY,
- PARTITION p1 ENGINE = MEMORY) */
+ PARTITION p1 ENGINE = MEMORY)
 alter table t1
 partition by key(a)
 (partition p0, partition p1 engine=heap);
@@ -1403,9 +1403,9 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 SUBPARTITION BY HASH (a)
-(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM) */
+(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM)
 alter table t1 add partition (partition p1 values less than (200)
 (subpartition subpart21));
 show create table t1;
@@ -1413,12 +1413,12 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 SUBPARTITION BY HASH (a)
 (PARTITION p0 VALUES LESS THAN (100)
  (SUBPARTITION p0sp0 ENGINE = MyISAM),
  PARTITION p1 VALUES LESS THAN (200)
- (SUBPARTITION subpart21 ENGINE = MyISAM)) */
+ (SUBPARTITION subpart21 ENGINE = MyISAM))
 drop table t1;
 create table t1 (a int)
 partition by key (a);
@@ -1427,16 +1427,16 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a) */
+ PARTITION BY KEY (a)
 alter table t1 add partition (partition p1);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION p0 ENGINE = MyISAM,
- PARTITION p1 ENGINE = MyISAM) */
+ PARTITION p1 ENGINE = MyISAM)
 drop table t1;
 create table t1 (a int, b int)
 partition by range (a)
@@ -1520,9 +1520,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 (PARTITION p1 VALUES IN (1) ENGINE = MyISAM,
- PARTITION p2 VALUES IN (2) ENGINE = MyISAM) */
+ PARTITION p2 VALUES IN (2) ENGINE = MyISAM)
 drop table t1;
 create table t1 (a int unsigned not null auto_increment primary key)
 partition by key(a);
@@ -1534,7 +1534,7 @@ t2	CREATE TABLE `t2` (
   `c` char(10) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='no comment'
-/*!50100 PARTITION BY KEY (a) */
+ PARTITION BY KEY (a)
 drop table t2;
 create table t1 (f1 int) partition by hash (f1) as select 1;
 drop table t1;
@@ -1731,8 +1731,8 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (NULL) ENGINE = MyISAM) */
+(PARTITION p0 VALUES IN (NULL) ENGINE = MyISAM)
 DROP TABLE t1;
 CREATE TABLE t1 (a int)
 PARTITION BY RANGE(a)
@@ -1769,8 +1769,8 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 )
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-(PARTITION p0) */
+(PARTITION p0)
 set session sql_mode='';
 drop table t1;
 create table t1 (a int)
@@ -1785,7 +1785,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` varchar(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a) */
+ PARTITION BY KEY (a)
 drop table t1;
 CREATE TABLE t1 (a int) ENGINE = MYISAM PARTITION BY KEY(a);
 INSERT into t1 values (1), (2);
@@ -1858,8 +1858,8 @@ t1	CREATE TABLE `t1` (
   `a` bigint(20) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 10 */
+PARTITIONS 10
 insert into t1 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE),
 (18446744073709551613), (18446744073709551612);
 select * from t1;
@@ -2024,9 +2024,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (b)
+ PARTITION BY RANGE (b)
 (PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p2 VALUES LESS THAN (20) ENGINE = MyISAM) */
+ PARTITION p2 VALUES LESS THAN (20) ENGINE = MyISAM)
 drop table t1, t2;
 create table t1
 (s1 timestamp on update current_timestamp, s2 int)
@@ -2164,12 +2164,12 @@ t1	CREATE TABLE `t1` (
   `user` char(25) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM AUTO_INCREMENT=16 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (id)
+ PARTITION BY RANGE (id)
 SUBPARTITION BY HASH (id)
 SUBPARTITIONS 2
 (PARTITION pa1 VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION pa2 VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION pa11 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION pa11 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 drop table t1;
 CREATE TABLE  t1 (
 `ID` bigint(20) NOT NULL AUTO_INCREMENT,

mysql-test/r/partition_cache_innodb.result

@@ -23,10 +23,10 @@ t1	CREATE TABLE `t1` (
   `created_at` datetime NOT NULL,
   `cool` tinyint(4) DEFAULT 0
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (TO_DAYS(created_at))
+ PARTITION BY RANGE (TO_DAYS(created_at))
 (PARTITION month_2010_4 VALUES LESS THAN (734258) ENGINE = InnoDB,
  PARTITION month_2010_5 VALUES LESS THAN (734289) ENGINE = InnoDB,
- PARTITION month_max VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
+ PARTITION month_max VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
 INSERT INTO t1 VALUES (1, now(), 0);
 flush status;
 show status like "Qcache_queries_in_cache";
@@ -72,12 +72,12 @@ t1	CREATE TABLE `t1` (
   `created_at` datetime NOT NULL,
   `cool` tinyint(4) DEFAULT 0
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (TO_DAYS(created_at))
+ PARTITION BY RANGE (TO_DAYS(created_at))
 SUBPARTITION BY HASH (cool)
 SUBPARTITIONS 3
 (PARTITION month_2010_4 VALUES LESS THAN (734258) ENGINE = InnoDB,
  PARTITION month_2010_5 VALUES LESS THAN (734289) ENGINE = InnoDB,
- PARTITION month_max VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
+ PARTITION month_max VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
 INSERT INTO t1 VALUES (1, now(), 0);
 flush status;
 show status like "Qcache_queries_in_cache";

mysql-test/r/partition_cache_myisam.result

@@ -23,10 +23,10 @@ t1	CREATE TABLE `t1` (
   `created_at` datetime NOT NULL,
   `cool` tinyint(4) DEFAULT 0
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (TO_DAYS(created_at))
+ PARTITION BY RANGE (TO_DAYS(created_at))
 (PARTITION month_2010_4 VALUES LESS THAN (734258) ENGINE = MyISAM,
  PARTITION month_2010_5 VALUES LESS THAN (734289) ENGINE = MyISAM,
- PARTITION month_max VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION month_max VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 INSERT INTO t1 VALUES (1, now(), 0);
 flush status;
 show status like "Qcache_queries_in_cache";
@@ -72,12 +72,12 @@ t1	CREATE TABLE `t1` (
   `created_at` datetime NOT NULL,
   `cool` tinyint(4) DEFAULT 0
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (TO_DAYS(created_at))
+ PARTITION BY RANGE (TO_DAYS(created_at))
 SUBPARTITION BY HASH (cool)
 SUBPARTITIONS 3
 (PARTITION month_2010_4 VALUES LESS THAN (734258) ENGINE = MyISAM,
  PARTITION month_2010_5 VALUES LESS THAN (734289) ENGINE = MyISAM,
- PARTITION month_max VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION month_max VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 INSERT INTO t1 VALUES (1, now(), 0);
 flush status;
 show status like "Qcache_queries_in_cache";

mysql-test/r/partition_column.result

@@ -30,9 +30,9 @@ t1	CREATE TABLE `t1` (
   `department` varchar(10) DEFAULT NULL,
   `country` varchar(255) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY LIST  COLUMNS(department,country)
+ PARTITION BY LIST  COLUMNS(department,country)
 (PARTITION first_office VALUES IN (('dep1','Russia'),('dep1','Croatia')) ENGINE = MyISAM,
- PARTITION second_office VALUES IN (('dep2','Russia')) ENGINE = MyISAM) */
+ PARTITION second_office VALUES IN (('dep2','Russia')) ENGINE = MyISAM)
 SELECT * FROM t1 WHERE department = 'dep2' and country = 'Croatia';
 id	name	department	country
 SELECT * FROM t1 WHERE department = 'dep1' and country = 'Croatia';
@@ -173,10 +173,10 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` varchar(5) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY LIST  COLUMNS(a)
+ PARTITION BY LIST  COLUMNS(a)
 (PARTITION p0 VALUES IN ('''') ENGINE = MyISAM,
  PARTITION p1 VALUES IN ('\\') ENGINE = MyISAM,
- PARTITION p2 VALUES IN ('\0') ENGINE = MyISAM) */
+ PARTITION p2 VALUES IN ('\0') ENGINE = MyISAM)
 drop table t1;
 set @@sql_mode=allow_invalid_dates;
 create table t1 (a char, b char, c date)
@@ -232,13 +232,13 @@ t1	CREATE TABLE `t1` (
   `c` varchar(25) DEFAULT NULL,
   `d` datetime DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY RANGE  COLUMNS(a,b,c,d)
+ PARTITION BY RANGE  COLUMNS(a,b,c,d)
 SUBPARTITION BY HASH (to_seconds(d))
 SUBPARTITIONS 4
 (PARTITION p0 VALUES LESS THAN (1,'0',MAXVALUE,'1900-01-01') ENGINE = MyISAM,
  PARTITION p1 VALUES LESS THAN (1,'a',MAXVALUE,'1999-01-01') ENGINE = MyISAM,
  PARTITION p2 VALUES LESS THAN (1,'b',MAXVALUE,MAXVALUE) ENGINE = MyISAM,
- PARTITION p3 VALUES LESS THAN (1,MAXVALUE,MAXVALUE,MAXVALUE) ENGINE = MyISAM) */
+ PARTITION p3 VALUES LESS THAN (1,MAXVALUE,MAXVALUE,MAXVALUE) ENGINE = MyISAM)
 drop table t1;
 create table t1 (a int, b int)
 partition by range columns (a,b)
@@ -315,10 +315,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY LIST  COLUMNS(a,b)
+ PARTITION BY LIST  COLUMNS(a,b)
 (PARTITION p0 VALUES IN ((1,NULL),(2,NULL),(NULL,NULL)) ENGINE = MyISAM,
  PARTITION p1 VALUES IN ((1,1),(2,2)) ENGINE = MyISAM,
- PARTITION p2 VALUES IN ((3,NULL),(NULL,1)) ENGINE = MyISAM) */
+ PARTITION p2 VALUES IN ((3,NULL),(NULL,1)) ENGINE = MyISAM)
 insert into t1 values (3, NULL);
 insert into t1 values (NULL, 1);
 insert into t1 values (NULL, NULL);
@@ -349,10 +349,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY LIST  COLUMNS(a,b)
+ PARTITION BY LIST  COLUMNS(a,b)
 (PARTITION p0 VALUES IN ((1,NULL),(2,NULL),(NULL,NULL)) ENGINE = MyISAM,
  PARTITION p1 VALUES IN ((1,1),(2,2)) ENGINE = MyISAM,
- PARTITION p2 VALUES IN ((3,NULL),(NULL,1)) ENGINE = MyISAM) */
+ PARTITION p2 VALUES IN ((3,NULL),(NULL,1)) ENGINE = MyISAM)
 drop table t1;
 create table t1 (a int)
 partition by list (a)
@@ -373,9 +373,9 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 (PARTITION p0 VALUES IN (2,1) ENGINE = MyISAM,
- PARTITION p1 VALUES IN (NULL,4,3) ENGINE = MyISAM) */
+ PARTITION p1 VALUES IN (NULL,4,3) ENGINE = MyISAM)
 insert into t1 values (1);
 insert into t1 values (2);
 insert into t1 values (3);
@@ -403,9 +403,9 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY LIST  COLUMNS(a)
+ PARTITION BY LIST  COLUMNS(a)
 (PARTITION p0 VALUES IN (2,1) ENGINE = MyISAM,
- PARTITION p1 VALUES IN (4,NULL,3) ENGINE = MyISAM) */
+ PARTITION p1 VALUES IN (4,NULL,3) ENGINE = MyISAM)
 insert into t1 values (1);
 insert into t1 values (2);
 insert into t1 values (3);
@@ -418,9 +418,9 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY LIST  COLUMNS(a)
+ PARTITION BY LIST  COLUMNS(a)
 (PARTITION p0 VALUES IN (2,1) ENGINE = MyISAM,
- PARTITION p1 VALUES IN (4,NULL,3) ENGINE = MyISAM) */
+ PARTITION p1 VALUES IN (4,NULL,3) ENGINE = MyISAM)
 drop table t1;
 create table t1 (a int, b char(10), c varchar(5), d int)
 partition by range columns(a,b,c)
@@ -453,13 +453,13 @@ t1	CREATE TABLE `t1` (
   `c` varchar(5) DEFAULT NULL,
   `d` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY RANGE  COLUMNS(a,b,c)
+ PARTITION BY RANGE  COLUMNS(a,b,c)
 SUBPARTITION BY KEY (c,d)
 SUBPARTITIONS 3
 (PARTITION p0 VALUES LESS THAN (1,'abc','abc') ENGINE = MyISAM,
  PARTITION p1 VALUES LESS THAN (2,'abc','abc') ENGINE = MyISAM,
  PARTITION p2 VALUES LESS THAN (3,'abc','abc') ENGINE = MyISAM,
- PARTITION p3 VALUES LESS THAN (4,'abc','abc') ENGINE = MyISAM) */
+ PARTITION p3 VALUES LESS THAN (4,'abc','abc') ENGINE = MyISAM)
 insert into t1 values (1,'a','b',1),(2,'a','b',2),(3,'a','b',3);
 insert into t1 values (1,'b','c',1),(2,'b','c',2),(3,'b','c',3);
 insert into t1 values (1,'c','d',1),(2,'c','d',2),(3,'c','d',3);
@@ -486,9 +486,9 @@ t1	CREATE TABLE `t1` (
   `b` varchar(2) DEFAULT NULL,
   `c` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY RANGE  COLUMNS(a,b,c)
+ PARTITION BY RANGE  COLUMNS(a,b,c)
 (PARTITION p0 VALUES LESS THAN (1,'A',1) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN (1,'B',1) ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN (1,'B',1) ENGINE = MyISAM)
 insert into t1 values (1, 'A', 1);
 explain partitions select * from t1 where a = 1 AND b <= 'A' and c = 1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra

mysql-test/r/partition_datatype.result

@@ -329,10 +329,10 @@ t1	CREATE TABLE `t1` (
   `a` bit(27) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION p1 ENGINE = MyISAM,
- PARTITION p2 ENGINE = MyISAM) */
+ PARTITION p2 ENGINE = MyISAM)
 insert into t1 values (1),(4),(7),(10),(13),(16),(19),(22),(25),(28),(31),(34);
 select hex(a) from t1 where a = 7;
 hex(a)
@@ -850,7 +850,7 @@ t2	CREATE TABLE `t2` (
   `a` timestamp NULL DEFAULT NULL,
   `tz` varchar(16) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (UNIX_TIMESTAMP(a))
+ PARTITION BY RANGE (UNIX_TIMESTAMP(a))
 (PARTITION p0 VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION `p-2000` VALUES LESS THAN (946684800) ENGINE = MyISAM,
  PARTITION `p-2011-MSK` VALUES LESS THAN (1301180400) ENGINE = MyISAM,
@@ -859,7 +859,7 @@ t2	CREATE TABLE `t2` (
  PARTITION `p-2012-MSK-1` VALUES LESS THAN (1319932800) ENGINE = MyISAM,
  PARTITION `p-2012-MSK-2` VALUES LESS THAN (1332630000) ENGINE = MyISAM,
  PARTITION pEnd VALUES LESS THAN (2147483647) ENGINE = MyISAM,
- PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 TRUNCATE TABLE t2;
 SET @@session.time_zone = 'Europe/Moscow';
 INSERT INTO t2 SELECT * FROM t1;
@@ -1334,7 +1334,7 @@ t2	CREATE TABLE `t2` (
   `a` timestamp NULL DEFAULT NULL,
   `tz` varchar(16) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (UNIX_TIMESTAMP(a))
+ PARTITION BY RANGE (UNIX_TIMESTAMP(a))
 (PARTITION p0 VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION `p-2000` VALUES LESS THAN (946684800) ENGINE = MyISAM,
  PARTITION `p-2011-MSK` VALUES LESS THAN (1301180400) ENGINE = MyISAM,
@@ -1343,7 +1343,7 @@ t2	CREATE TABLE `t2` (
  PARTITION `p-2012-MSK-1` VALUES LESS THAN (1319932800) ENGINE = MyISAM,
  PARTITION `p-2012-MSK-2` VALUES LESS THAN (1332630000) ENGINE = MyISAM,
  PARTITION pEnd VALUES LESS THAN (2147483647) ENGINE = MyISAM,
- PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 TRUNCATE TABLE t2;
 DROP TABLE t1, t2;
 SET @@session.time_zone= @old_time_zone;

mysql-test/r/partition_default.result

@@ -22,10 +22,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 (PARTITION p2 VALUES IN (4,5,6) ENGINE = MyISAM,
  PARTITION p1 VALUES IN (1) ENGINE = MyISAM,
- PARTITION p0 DEFAULT ENGINE = MyISAM) */
+ PARTITION p0 DEFAULT ENGINE = MyISAM)
 insert into t1 values (10,10);
 insert into t1 values (4,4);
 select * from t1;
@@ -72,10 +72,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 (PARTITION p0 DEFAULT ENGINE = MyISAM,
  PARTITION p2 VALUES IN (4,5,6) ENGINE = MyISAM,
- PARTITION p1 VALUES IN (1) ENGINE = MyISAM) */
+ PARTITION p1 VALUES IN (1) ENGINE = MyISAM)
 insert into t1 values (10,10);
 select * from t1;
 a	b
@@ -100,10 +100,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 (PARTITION p0 DEFAULT ENGINE = MyISAM,
  PARTITION p2 VALUES IN (4,5,6) ENGINE = MyISAM,
- PARTITION p1 VALUES IN (1,0) ENGINE = MyISAM) */
+ PARTITION p1 VALUES IN (1,0) ENGINE = MyISAM)
 insert into t1 values (10,10);
 select * from t1;
 a	b
@@ -128,10 +128,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY LIST  COLUMNS(a,b)
+ PARTITION BY LIST  COLUMNS(a,b)
 (PARTITION p2 VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM,
  PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
- PARTITION p0 DEFAULT ENGINE = MyISAM) */
+ PARTITION p0 DEFAULT ENGINE = MyISAM)
 insert into t1 values (10,10);
 select * from t1;
 a	b
@@ -176,10 +176,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 (PARTITION p2 VALUES IN (4,5,6) ENGINE = MyISAM,
  PARTITION p1 VALUES IN (1,20) ENGINE = MyISAM,
- PARTITION p0 DEFAULT ENGINE = MyISAM) */
+ PARTITION p0 DEFAULT ENGINE = MyISAM)
 insert into t1 values (10,10);
 select partition_name, table_rows from INFORMATION_SCHEMA.PARTITIONS where table_name='t1';
 partition_name	table_rows
@@ -256,10 +256,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY LIST  COLUMNS(a,b)
+ PARTITION BY LIST  COLUMNS(a,b)
 (PARTITION p2 VALUES IN ((1,4),(2,5),(3,6),(5,5)) ENGINE = MyISAM,
  PARTITION p1 VALUES IN ((1,1),(20,20)) ENGINE = MyISAM,
- PARTITION p0 DEFAULT ENGINE = MyISAM) */
+ PARTITION p0 DEFAULT ENGINE = MyISAM)
 insert into t1 values (10,10);
 select partition_name, table_rows from INFORMATION_SCHEMA.PARTITIONS where table_name='t1';
 partition_name	table_rows
@@ -325,10 +325,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a+b)
+ PARTITION BY LIST (a+b)
 (PARTITION p2 VALUES IN (1,2,3,7) ENGINE = MyISAM,
  PARTITION p1 VALUES IN (21,0) ENGINE = MyISAM,
- PARTITION p0 DEFAULT ENGINE = MyISAM) */
+ PARTITION p0 DEFAULT ENGINE = MyISAM)
 select * from t1;
 a	b
 2	5
@@ -362,10 +362,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a+5)
+ PARTITION BY LIST (a+5)
 (PARTITION p2 VALUES IN (1,2,3,7) ENGINE = MyISAM,
  PARTITION p1 VALUES IN (0) ENGINE = MyISAM,
- PARTITION p0 DEFAULT ENGINE = MyISAM) */
+ PARTITION p0 DEFAULT ENGINE = MyISAM)
 select * from t1;
 a	b
 2	5
@@ -832,10 +832,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 (PARTITION p2 VALUES IN (1,2,3) ENGINE = MyISAM,
  PARTITION p1 VALUES IN (20,0) ENGINE = MyISAM,
- PARTITION p0 DEFAULT ENGINE = MyISAM) */
+ PARTITION p0 DEFAULT ENGINE = MyISAM)
 select * from t1;
 a	b
 2	5
@@ -866,10 +866,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 (PARTITION p2 VALUES IN (1,2,3) ENGINE = MyISAM,
  PARTITION p1 VALUES IN (20,0) ENGINE = MyISAM,
- PARTITION p0 VALUES IN (10) ENGINE = MyISAM) */
+ PARTITION p0 VALUES IN (10) ENGINE = MyISAM)
 select * from t1;
 a	b
 2	5
@@ -900,10 +900,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 (PARTITION p2 DEFAULT ENGINE = MyISAM,
  PARTITION p1 VALUES IN (20,0) ENGINE = MyISAM,
- PARTITION p0 VALUES IN (10) ENGINE = MyISAM) */
+ PARTITION p0 VALUES IN (10) ENGINE = MyISAM)
 select * from t1;
 a	b
 2	5
@@ -930,9 +930,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 (PARTITION p1 VALUES IN (20,0) ENGINE = MyISAM,
- PARTITION p0 VALUES IN (10) ENGINE = MyISAM) */
+ PARTITION p0 VALUES IN (10) ENGINE = MyISAM)
 select * from t1;
 a	b
 0	0
@@ -948,10 +948,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 (PARTITION p1 VALUES IN (20,0) ENGINE = MyISAM,
  PARTITION p0 VALUES IN (10) ENGINE = MyISAM,
- PARTITION pd DEFAULT ENGINE = MyISAM) */
+ PARTITION pd DEFAULT ENGINE = MyISAM)
 alter table t1 add partition (PARTITION pdd DEFAULT);
 ERROR HY000: Only one DEFAULT partition allowed
 alter table t1 drop partition pd;
@@ -980,10 +980,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY LIST  COLUMNS(a,b)
+ PARTITION BY LIST  COLUMNS(a,b)
 (PARTITION p2 VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM,
  PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
- PARTITION p0 DEFAULT ENGINE = MyISAM) */
+ PARTITION p0 DEFAULT ENGINE = MyISAM)
 select * from t1;
 a	b
 2	5
@@ -1014,10 +1014,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY LIST  COLUMNS(a,b)
+ PARTITION BY LIST  COLUMNS(a,b)
 (PARTITION p2 VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM,
  PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
- PARTITION p0 VALUES IN ((10,10)) ENGINE = MyISAM) */
+ PARTITION p0 VALUES IN ((10,10)) ENGINE = MyISAM)
 select * from t1;
 a	b
 2	5
@@ -1048,10 +1048,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY LIST  COLUMNS(a,b)
+ PARTITION BY LIST  COLUMNS(a,b)
 (PARTITION p2 DEFAULT ENGINE = MyISAM,
  PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
- PARTITION p0 VALUES IN ((10,10)) ENGINE = MyISAM) */
+ PARTITION p0 VALUES IN ((10,10)) ENGINE = MyISAM)
 select * from t1;
 a	b
 2	5
@@ -1078,9 +1078,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY LIST  COLUMNS(a,b)
+ PARTITION BY LIST  COLUMNS(a,b)
 (PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
- PARTITION p0 VALUES IN ((10,10)) ENGINE = MyISAM) */
+ PARTITION p0 VALUES IN ((10,10)) ENGINE = MyISAM)
 select * from t1;
 a	b
 0	0
@@ -1096,10 +1096,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY LIST  COLUMNS(a,b)
+ PARTITION BY LIST  COLUMNS(a,b)
 (PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
  PARTITION p0 VALUES IN ((10,10)) ENGINE = MyISAM,
- PARTITION pd DEFAULT ENGINE = MyISAM) */
+ PARTITION pd DEFAULT ENGINE = MyISAM)
 alter table t1 add partition (PARTITION pdd DEFAULT);
 ERROR HY000: Only one DEFAULT partition allowed
 alter table t1 drop partition pd;
@@ -1144,10 +1144,10 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY LIST  COLUMNS(a,b)
+ PARTITION BY LIST  COLUMNS(a,b)
 (PARTITION p0 DEFAULT ENGINE = MyISAM,
  PARTITION p2 VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM,
- PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM) */
+ PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM)
 drop table t1;
 #
 # MDEV-10765: Wrong result - query does not retrieve values from

mysql-test/r/partition_error.result

@@ -781,9 +781,9 @@ t1	CREATE TABLE `t1` (
   `id` int(11) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=<curr_engine> DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (YEAR(purchased))
+ PARTITION BY RANGE (YEAR(purchased))
 SUBPARTITION BY HASH (TO_DAYS(purchased))
-(PARTITION p0 VALUES LESS THAN MAXVALUE ENGINE = <curr_engine>) */
+(PARTITION p0 VALUES LESS THAN MAXVALUE ENGINE = <curr_engine>)
 DROP TABLE t1;
 CREATE TABLE t1 (id INT, purchased DATE)
 PARTITION BY RANGE(YEAR(purchased))
@@ -802,11 +802,11 @@ t1	CREATE TABLE `t1` (
   `id` int(11) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=<curr_engine> DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (YEAR(purchased))
+ PARTITION BY RANGE (YEAR(purchased))
 SUBPARTITION BY HASH (TO_DAYS(purchased))
 (PARTITION p0 VALUES LESS THAN MAXVALUE
  (SUBPARTITION sp0 ENGINE = <curr_engine>,
-  SUBPARTITION sp1 ENGINE = <curr_engine>)) */
+  SUBPARTITION sp1 ENGINE = <curr_engine>))
 DROP TABLE t1;
 CREATE TABLE t1 (id INT, purchased DATE)
 PARTITION BY RANGE(YEAR(purchased))
@@ -822,8 +822,8 @@ t1	CREATE TABLE `t1` (
   `id` int(11) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=<curr_engine> DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (YEAR(purchased))
+ PARTITION BY RANGE (YEAR(purchased))
-(PARTITION p0 VALUES LESS THAN MAXVALUE ENGINE = <curr_engine>) */
+(PARTITION p0 VALUES LESS THAN MAXVALUE ENGINE = <curr_engine>)
 DROP TABLE t1;
 SET @@sql_mode= @org_mode;
 CREATE TABLE t1 (a INTEGER NOT NULL, PRIMARY KEY (a));
@@ -1783,14 +1783,14 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 SUBPARTITION BY HASH (a)
 (PARTITION p1 VALUES IN (1)
  (SUBPARTITION p1spFirst COMMENT = 'SubPartition comment in p1spFirst' ENGINE = MyISAM,
   SUBPARTITION p1spSecond COMMENT = 'SubPartition comment in p1spSecond' ENGINE = MyISAM),
  PARTITION p2 VALUES IN (2)
  (SUBPARTITION p2spFirst COMMENT = 'SubPartition comment in p2spFirst' ENGINE = MyISAM,
-  SUBPARTITION p2spSecond COMMENT = 'SubPartition comment in p2spSecond' ENGINE = MyISAM)) */
+  SUBPARTITION p2spSecond COMMENT = 'SubPartition comment in p2spSecond' ENGINE = MyISAM))
 SELECT PARTITION_NAME, SUBPARTITION_NAME, PARTITION_COMMENT FROM INFORMATION_SCHEMA.PARTITIONS
 WHERE TABLE_NAME = 't1' AND TABLE_SCHEMA = 'test';
 PARTITION_NAME	SUBPARTITION_NAME	PARTITION_COMMENT
@@ -1813,14 +1813,14 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 SUBPARTITION BY HASH (a)
 (PARTITION p1 VALUES IN (1)
  (SUBPARTITION p1spFirst COMMENT = 'SubPartition comment in p1spFirst' ENGINE = MyISAM,
   SUBPARTITION p1spSecond ENGINE = MyISAM),
  PARTITION p2 VALUES IN (2)
  (SUBPARTITION p2spFirst COMMENT = 'Comment in p2' ENGINE = MyISAM,
-  SUBPARTITION p2spSecond COMMENT = 'SubPartition comment in p2spSecond' ENGINE = MyISAM)) */
+  SUBPARTITION p2spSecond COMMENT = 'SubPartition comment in p2spSecond' ENGINE = MyISAM))
 SELECT PARTITION_NAME, SUBPARTITION_NAME, PARTITION_COMMENT FROM INFORMATION_SCHEMA.PARTITIONS
 WHERE TABLE_NAME = 't1' AND TABLE_SCHEMA = 'test';
 PARTITION_NAME	SUBPARTITION_NAME	PARTITION_COMMENT
@@ -1849,14 +1849,14 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   KEY `inx_a` (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 SUBPARTITION BY HASH (a)
 (PARTITION pUpTo10 VALUES LESS THAN (10)
  (SUBPARTITION `p-10sp0` COMMENT = 'This is a long comment (2050 ascii characters)   50 pUpTo10 partition ......80-!.................. 100 ................................................................................................ 200....................................................................................................................................................................................................................................................................................................... 500 ............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... 1000 ..............1024-|' ENGINE = MyISAM,
   SUBPARTITION `p-10sp1` COMMENT = 'This is a long comment (2050 ascii characters)   50 pUpTo10 partition ......80-!.................. 100 ................................................................................................ 200....................................................................................................................................................................................................................................................................................................... 500 ............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... 1000 ..............1024-|' ENGINE = MyISAM),
  PARTITION pMax VALUES LESS THAN MAXVALUE
  (SUBPARTITION pMaxsp0 COMMENT = 'This is a long comment (2050 ascii characters)   50 pMax partition comment .80-!.................. 100 ................................................................................................ 200....................................................................................................................................................................................................................................................................................................... 500 ............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... 1000 ..............1024-|' ENGINE = MyISAM,
-  SUBPARTITION pMaxsp1 COMMENT = 'This is a long comment (2050 ascii characters)   50 pMax partition comment .80-!.................. 100 ................................................................................................ 200....................................................................................................................................................................................................................................................................................................... 500 ............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... 1000 ..............1024-|' ENGINE = MyISAM)) */
+  SUBPARTITION pMaxsp1 COMMENT = 'This is a long comment (2050 ascii characters)   50 pMax partition comment .80-!.................. 100 ................................................................................................ 200....................................................................................................................................................................................................................................................................................................... 500 ............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... 1000 ..............1024-|' ENGINE = MyISAM))
 SELECT PARTITION_NAME, SUBPARTITION_NAME, PARTITION_COMMENT FROM INFORMATION_SCHEMA.PARTITIONS
 WHERE TABLE_NAME = 't1' AND TABLE_SCHEMA = 'test';
 PARTITION_NAME	SUBPARTITION_NAME	PARTITION_COMMENT

mysql-test/r/partition_example.result

@@ -8,9 +8,9 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL
 ) ENGINE=EXAMPLE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 (PARTITION p0 VALUES IN (1) ENGINE = EXAMPLE,
- PARTITION p1 VALUES IN (2) ENGINE = EXAMPLE) */
+ PARTITION p1 VALUES IN (2) ENGINE = EXAMPLE)
 drop table t1;
 create table t1 (a int not null)
 engine=example ull=12340
@@ -21,9 +21,9 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL
 ) ENGINE=EXAMPLE DEFAULT CHARSET=latin1 `ull`=12340
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 (PARTITION p0 VALUES IN (1) ENGINE = EXAMPLE,
- PARTITION p1 VALUES IN (2) ENGINE = EXAMPLE) */
+ PARTITION p1 VALUES IN (2) ENGINE = EXAMPLE)
 drop table t1;
 select 1;
 1

mysql-test/r/partition_exchange.result

@@ -28,8 +28,8 @@ Create Table	CREATE TABLE `t1` (
   `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
-/*!50100 PARTITION BY HASH (id)
+ PARTITION BY HASH (id)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t2;
 Table	t2
 Create Table	CREATE TABLE `t2` (
@@ -64,8 +64,8 @@ Create Table	CREATE TABLE `t1` (
   `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
-/*!50100 PARTITION BY HASH (id)
+ PARTITION BY HASH (id)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t2;
 Table	t2
 Create Table	CREATE TABLE `t2` (
@@ -112,8 +112,8 @@ Create Table	CREATE TABLE `t1` (
   `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
-/*!50100 PARTITION BY HASH (id)
+ PARTITION BY HASH (id)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t2;
 Table	t2
 Create Table	CREATE TABLE `t2` (
@@ -172,8 +172,8 @@ Create Table	CREATE TABLE `t1` (
   `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (id)
+ PARTITION BY HASH (id)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t2;
 Table	t2
 Create Table	CREATE TABLE `t2` (
@@ -232,8 +232,8 @@ Create Table	CREATE TABLE `t1` (
   `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (id)
+ PARTITION BY HASH (id)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t2;
 Table	t2
 Create Table	CREATE TABLE `t2` (
@@ -292,8 +292,8 @@ Create Table	CREATE TABLE `t1` (
   `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT
-/*!50100 PARTITION BY HASH (id)
+ PARTITION BY HASH (id)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t2;
 Table	t2
 Create Table	CREATE TABLE `t2` (
@@ -349,8 +349,8 @@ Create Table	CREATE TABLE `t1` (
   `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (id)
+ PARTITION BY HASH (id)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t2;
 Table	t2
 Create Table	CREATE TABLE `t2` (
@@ -406,8 +406,8 @@ Create Table	CREATE TABLE `t1` (
   `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
-/*!50100 PARTITION BY HASH (id)
+ PARTITION BY HASH (id)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t2;
 Table	t2
 Create Table	CREATE TABLE `t2` (
@@ -496,9 +496,9 @@ tp	CREATE TABLE `tp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t;
 a	b
 1	First value
@@ -534,9 +534,9 @@ tp	CREATE TABLE `tp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t;
 a	b
 10	Ten
@@ -594,9 +594,9 @@ tp	CREATE TABLE `tp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t;
 a	b
 1	First value
@@ -650,9 +650,9 @@ tp	CREATE TABLE `tp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SHOW CREATE TABLE tsp;
 Table	Create Table
 tsp	CREATE TABLE `tsp` (
@@ -660,14 +660,14 @@ tsp	CREATE TABLE `tsp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 SUBPARTITION BY HASH (a)
 (PARTITION p0 VALUES LESS THAN (100)
  (SUBPARTITION sp0 ENGINE = MyISAM,
   SUBPARTITION sp1 ENGINE = MyISAM),
  PARTITION p1 VALUES LESS THAN MAXVALUE
  (SUBPARTITION sp2 ENGINE = MyISAM,
-  SUBPARTITION sp3 ENGINE = MyISAM)) */
+  SUBPARTITION sp3 ENGINE = MyISAM))
 SELECT * FROM t;
 a	b
 1	First value
@@ -704,9 +704,9 @@ tp	CREATE TABLE `tp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t;
 a	b
 10	Ten
@@ -742,9 +742,9 @@ tp	CREATE TABLE `tp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t;
 a	b
 1	First value
@@ -781,14 +781,14 @@ tsp	CREATE TABLE `tsp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 SUBPARTITION BY HASH (a)
 (PARTITION p0 VALUES LESS THAN (100)
  (SUBPARTITION sp0 ENGINE = MyISAM,
   SUBPARTITION sp1 ENGINE = MyISAM),
  PARTITION p1 VALUES LESS THAN MAXVALUE
  (SUBPARTITION sp2 ENGINE = MyISAM,
-  SUBPARTITION sp3 ENGINE = MyISAM)) */
+  SUBPARTITION sp3 ENGINE = MyISAM))
 SELECT * FROM t;
 a	b
 61	Sixty one
@@ -826,9 +826,9 @@ tp	CREATE TABLE `tp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = InnoDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
 SELECT * FROM t;
 a	b
 1	First value
@@ -864,9 +864,9 @@ tp	CREATE TABLE `tp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = InnoDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
 SELECT * FROM t;
 a	b
 10	Ten
@@ -905,9 +905,9 @@ tp	CREATE TABLE `tp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = InnoDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
 ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t;
 ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MariaDB
 SHOW CREATE TABLE t;
@@ -924,9 +924,9 @@ tp	CREATE TABLE `tp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = InnoDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
 # Test different charsets
 ALTER TABLE t ENGINE = MyISAM;
 CREATE TABLE tmp LIKE t;
@@ -957,9 +957,9 @@ tp	CREATE TABLE `tp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t;
 ERROR HY000: Non matching attribute 'MAX_ROWS' between partition and table
 SHOW WARNINGS;
@@ -988,9 +988,9 @@ tp	CREATE TABLE `tp` (
   PRIMARY KEY (`a`),
   KEY `ba_key` (`b`,`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t;
 a	b
 10	Ten
@@ -1047,9 +1047,9 @@ tp	CREATE TABLE `tp` (
   PRIMARY KEY (`a`),
   KEY `ba_key` (`b`,`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t;
 ERROR HY000: Table to exchange with partition is temporary: 't'
 SHOW CREATE TABLE t;
@@ -1068,9 +1068,9 @@ tp	CREATE TABLE `tp` (
   PRIMARY KEY (`a`),
   KEY `ba_key` (`b`,`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 DROP TEMPORARY TABLE t;
 ALTER TABLE tmp2 RENAME TO t;
 # Test non partitioned table

mysql-test/r/partition_explicit_prune.result

@@ -202,7 +202,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`a`),
   KEY `b` (`b`,`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 SUBPARTITION BY HASH (a)
 (PARTITION pNeg VALUES LESS THAN (0)
  (SUBPARTITION subp0 ENGINE = InnoDB,
@@ -215,7 +215,7 @@ SUBPARTITION BY HASH (a)
   SUBPARTITION subp5 ENGINE = InnoDB),
  PARTITION `p100-99999` VALUES LESS THAN (100000)
  (SUBPARTITION subp6 ENGINE = InnoDB,
-  SUBPARTITION subp7 ENGINE = InnoDB)) */
+  SUBPARTITION subp7 ENGINE = InnoDB))
 # First test that the syntax is OK
 SHOW CREATE TABLE t1 PARTITION (subp0);
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'PARTITION (subp0)' at line 1
@@ -1125,7 +1125,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`a`),
   KEY `b` (`b`,`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 SUBPARTITION BY HASH (a)
 (PARTITION pNeg VALUES LESS THAN (0)
  (SUBPARTITION subp0 ENGINE = InnoDB,
@@ -1138,7 +1138,7 @@ SUBPARTITION BY HASH (a)
   SUBPARTITION subp5 ENGINE = InnoDB),
  PARTITION `p100-99999` VALUES LESS THAN (100000)
  (SUBPARTITION subp6 ENGINE = InnoDB,
-  SUBPARTITION subp7 ENGINE = InnoDB)) */
+  SUBPARTITION subp7 ENGINE = InnoDB))
 SELECT * FROM t1;
 a	b
 -4	(pNeg-)subp0, Updated, Updated2, Updated from a = -2
@@ -1157,7 +1157,7 @@ t2	CREATE TABLE `t2` (
   PRIMARY KEY (`a`),
   KEY `b` (`b`,`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 SUBPARTITION BY HASH (a)
 (PARTITION pNeg VALUES LESS THAN (0)
  (SUBPARTITION subp0 ENGINE = InnoDB,
@@ -1170,7 +1170,7 @@ SUBPARTITION BY HASH (a)
   SUBPARTITION subp5 ENGINE = InnoDB),
  PARTITION `p100-99999` VALUES LESS THAN (100000)
  (SUBPARTITION subp6 ENGINE = InnoDB,
-  SUBPARTITION subp7 ENGINE = InnoDB)) */
+  SUBPARTITION subp7 ENGINE = InnoDB))
 SELECT * FROM t2;
 a	b
 10	p10-99
@@ -1657,7 +1657,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`a`),
   KEY `b` (`b`,`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 SUBPARTITION BY HASH (a)
 (PARTITION pNeg VALUES LESS THAN (0)
  (SUBPARTITION subp0 ENGINE = InnoDB,
@@ -1678,7 +1678,7 @@ SUBPARTITION BY HASH (a)
  PARTITION `p3000-299999` VALUES LESS THAN (300000)
  (SUBPARTITION subp12 ENGINE = InnoDB,
   SUBPARTITION subp13 ENGINE = InnoDB,
-  SUBPARTITION subp14 ENGINE = InnoDB)) */
+  SUBPARTITION subp14 ENGINE = InnoDB))
 INSERT INTO t1 VALUES (-9, "negative nine"), (-8, "-8"), (-7, "-7"), (-6, "-6"), (-5, "-5"), (-4, "-4"), (-3, "-3"), (-2, "-2"), (-1, "-1");
 INSERT INTO t1 VALUES (9, "nine"), (8, "8"), (7, "7"), (6, "6"), (5, "5"), (4, "4"), (3, "3"), (2, "2"), (1, "1");
 INSERT INTO t1 VALUES (39, "Thirty nine"), (38, "38"), (37, "37"), (36, "36"), (35, "35"), (34, "34"), (33, "33"), (32, "32"), (31, "31");

mysql-test/r/partition_innodb.result

@@ -446,7 +446,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a) */
+ PARTITION BY KEY (a)
 drop table t1;
 create table t1 (a int)
 engine = innodb
@@ -460,8 +460,8 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
-(PARTITION p0 VALUES IN (0) ENGINE = InnoDB) */
+(PARTITION p0 VALUES IN (0) ENGINE = InnoDB)
 drop table t1;
 SET SQL_MODE=default;
 create table t1
@@ -539,10 +539,10 @@ 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)
+ PARTITION BY RANGE (int_column)
 SUBPARTITION BY KEY (char_column)
 SUBPARTITIONS 2
-(PARTITION p1 VALUES LESS THAN (5) ENGINE = MyISAM) */
+(PARTITION p1 VALUES LESS THAN (5) ENGINE = MyISAM)
 drop table t1;
 CREATE TABLE t1 (a INT) ENGINE=InnoDB
 PARTITION BY list(a) (PARTITION p1 VALUES IN (1));
@@ -587,8 +587,8 @@ t1	CREATE TABLE `t1` (
   `b` int(11) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1;
 a	b
 1	2

mysql-test/r/partition_innodb_plugin.result

@@ -29,9 +29,9 @@ t1	CREATE TABLE `t1` (
   `id2` bigint(20) NOT NULL,
   PRIMARY KEY (`id`,`time`)
 ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8
-/*!50100 PARTITION BY RANGE (TO_DAYS(time))
+ PARTITION BY RANGE (TO_DAYS(time))
 (PARTITION p10 VALUES LESS THAN (734708) ENGINE = InnoDB,
- PARTITION p20 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
+ PARTITION p20 VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
 DROP TABLE t1;
 call mtr.add_suppression("InnoDB: Error: table `test`.`t1` .* InnoDB internal");
 #
@@ -62,8 +62,8 @@ t1	CREATE TABLE `t1` (
   `user_num` char(10) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=4
-/*!50100 PARTITION BY HASH (id)
+ PARTITION BY HASH (id)
-PARTITIONS 1 */
+PARTITIONS 1
 SET GLOBAL innodb_file_per_table = OFF;
 disconnect con1;
 connect con2,localhost,root,,;
@@ -100,8 +100,8 @@ t1	CREATE TABLE `t1` (
   `user_num` char(10) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=4
-/*!50100 PARTITION BY HASH (id)
+ PARTITION BY HASH (id)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 disconnect con2;
 connection default;

mysql-test/r/partition_mgm.result

@@ -24,8 +24,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date))
+ PARTITION BY HASH (YEAR(f_date))
-PARTITIONS 2 */
+PARTITIONS 2
 ALTER TABLE t1 COALESCE PARTITION 1;
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -33,8 +33,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date))
+ PARTITION BY HASH (YEAR(f_date))
-PARTITIONS 1 */
+PARTITIONS 1
 drop table t1;
 create table t1 (a int)
 partition by list (a)
@@ -58,8 +58,8 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 CREATE TABLE t1 (a INT)
 /*!50100 PARTITION BY HASH (a)
@@ -70,8 +70,8 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 CREATE TABLE t1 (a INT)
 /*!50100 PARTITION BY HASH (a)
@@ -81,8 +81,8 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 CREATE TABLE t1 (a INT) /*!50100 PARTITION BY HASH (a) PARTITIONS 5 */;
 SHOW CREATE TABLE t1;
@@ -90,6 +90,6 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;

mysql-test/r/partition_mgm_err.result

@@ -145,8 +145,8 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 CREATE TABLE t1 (a INT) PARTITION BY HASH(a);
 ALTER TABLE t1 ADD PARTITION PARTITIONS 4;

mysql-test/r/partition_myisam.result

@@ -27,10 +27,10 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `i` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 CHECKSUM=1
-/*!50100 PARTITION BY RANGE (i)
+ PARTITION BY RANGE (i)
 (PARTITION p3 VALUES LESS THAN (3) ENGINE = MyISAM,
  PARTITION p5 VALUES LESS THAN (5) ENGINE = MyISAM,
- PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 DROP TABLE t1;
 # Same test without partitioning
 CREATE TABLE t1 (
@@ -131,7 +131,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM AUTO_INCREMENT=14 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a) */
+ PARTITION BY KEY (a)
 INSERT INTO t1 VALUES (NULL);
 SELECT * FROM t1;
 a

mysql-test/r/partition_not_windows.result

@@ -31,8 +31,8 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `i` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (i)
+ PARTITION BY RANGE (i)
-(PARTITION p01 VALUES LESS THAN (1000) ENGINE = MyISAM) */
+(PARTITION p01 VALUES LESS THAN (1000) ENGINE = MyISAM)
 DROP TABLE t1, t2;
 set @@sql_mode=@org_mode;
 CREATE TABLE t1(a INT)

mysql-test/r/partition_range.result

@@ -22,9 +22,9 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` datetime DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY RANGE (TO_DAYS(a))
+ PARTITION BY RANGE (TO_DAYS(a))
 SUBPARTITION BY HASH (to_seconds(a))
-(PARTITION p0 VALUES LESS THAN (1) ENGINE = MyISAM) */
+(PARTITION p0 VALUES LESS THAN (1) ENGINE = MyISAM)
 drop table t1;
 create table t1 (a int)
 partition by range (a)
@@ -62,9 +62,9 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` datetime NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY RANGE (TO_SECONDS(a))
+ PARTITION BY RANGE (TO_SECONDS(a))
 (PARTITION p0 VALUES LESS THAN (63340531200) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN (63342604800) ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN (63342604800) ENGINE = MyISAM)
 drop table t1;
 create table t1 (a date)
 partition by range(to_seconds(a))
@@ -93,9 +93,9 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` date DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY RANGE (to_seconds(a))
+ PARTITION BY RANGE (to_seconds(a))
 (PARTITION p0 VALUES LESS THAN (63240134400) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN (63271756800) ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN (63271756800) ENGINE = MyISAM)
 drop table t1;
 create table t1 (a datetime)
 partition by range(to_seconds(a))
@@ -123,9 +123,9 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` datetime DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY RANGE (to_seconds(a))
+ PARTITION BY RANGE (to_seconds(a))
 (PARTITION p0 VALUES LESS THAN (63240177600) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN (63271800000) ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN (63271800000) ENGINE = MyISAM)
 drop table t1;
 create table t1 (a int, b char(20))
 partition by range columns(a,b)
@@ -153,8 +153,8 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+(PARTITION p0 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 drop table t1;
 create table t1 (a integer)
 partition by range (a)
@@ -284,10 +284,10 @@ t1	CREATE TABLE `t1` (
   `c` int(11) NOT NULL,
   PRIMARY KEY (`a`,`b`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION x1 VALUES LESS THAN (5) TABLESPACE = ts1 ENGINE = MyISAM,
  PARTITION x2 VALUES LESS THAN (10) TABLESPACE = ts2 ENGINE = MyISAM,
- PARTITION x3 VALUES LESS THAN MAXVALUE TABLESPACE = ts3 ENGINE = MyISAM) */
+ PARTITION x3 VALUES LESS THAN MAXVALUE TABLESPACE = ts3 ENGINE = MyISAM)
 ALTER TABLE t1
 partition by range (a)
 partitions 3
@@ -308,10 +308,10 @@ t1	CREATE TABLE `t1` (
   `c` int(11) NOT NULL,
   PRIMARY KEY (`a`,`b`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION x1 VALUES LESS THAN (5) TABLESPACE = ts1 ENGINE = MyISAM,
  PARTITION x2 VALUES LESS THAN (10) TABLESPACE = ts2 ENGINE = MyISAM,
- PARTITION x3 VALUES LESS THAN MAXVALUE TABLESPACE = ts3 ENGINE = MyISAM) */
+ PARTITION x3 VALUES LESS THAN MAXVALUE TABLESPACE = ts3 ENGINE = MyISAM)
 drop table if exists t1;
 CREATE TABLE t1 (
 a int not null,
@@ -409,14 +409,14 @@ t1	CREATE TABLE `t1` (
   `c` int(11) NOT NULL,
   PRIMARY KEY (`a`,`b`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 SUBPARTITION BY HASH (a+b)
 (PARTITION x1 VALUES LESS THAN (1)
  (SUBPARTITION x11 ENGINE = MyISAM,
   SUBPARTITION x12 ENGINE = MyISAM),
  PARTITION x2 VALUES LESS THAN (5)
  (SUBPARTITION x21 ENGINE = MyISAM,
-  SUBPARTITION x22 ENGINE = MyISAM)) */
+  SUBPARTITION x22 ENGINE = MyISAM))
 ALTER TABLE t1 ADD COLUMN d int;
 show create table t1;
 Table	Create Table
@@ -427,14 +427,14 @@ t1	CREATE TABLE `t1` (
   `d` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`,`b`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 SUBPARTITION BY HASH (a+b)
 (PARTITION x1 VALUES LESS THAN (1)
  (SUBPARTITION x11 ENGINE = MyISAM,
   SUBPARTITION x12 ENGINE = MyISAM),
  PARTITION x2 VALUES LESS THAN (5)
  (SUBPARTITION x21 ENGINE = MyISAM,
-  SUBPARTITION x22 ENGINE = MyISAM)) */
+  SUBPARTITION x22 ENGINE = MyISAM))
 drop table t1;
 CREATE TABLE t1 (
 a int not null,
@@ -658,9 +658,9 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` bigint(20) unsigned DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (0) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM)
 drop table t1;
 create table t1 (a bigint unsigned)
 partition by range (a)
@@ -671,9 +671,9 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` bigint(20) unsigned DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (2) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM)
 insert into t1 values (0xFFFFFFFFFFFFFFFF);
 ERROR HY000: Table has no partition for value 18446744073709551615
 drop table t1;

mysql-test/r/partition_symlink.result

@@ -22,10 +22,10 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 (PARTITION p0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/tmp' ENGINE = MyISAM,
  PARTITION p1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/tmp' ENGINE = MyISAM,
- PARTITION p2 VALUES IN (2) ENGINE = MyISAM) */
+ PARTITION p2 VALUES IN (2) ENGINE = MyISAM)
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
@@ -158,8 +158,8 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `i` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (i)
+ PARTITION BY RANGE (i)
-(PARTITION p01 VALUES LESS THAN (1000) ENGINE = MyISAM) */
+(PARTITION p01 VALUES LESS THAN (1000) ENGINE = MyISAM)
 DROP TABLE t1, t2;
 set @@sql_mode=@org_mode;
 create table t1 (a int)

mysql-test/r/partition_utf8.result

@@ -7,8 +7,8 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` varchar(2) CHARACTER SET cp1250 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY LIST  COLUMNS(a)
+ PARTITION BY LIST  COLUMNS(a)
-(PARTITION p0 VALUES IN (_cp1250 0x81) ENGINE = MyISAM) */
+(PARTITION p0 VALUES IN (_cp1250 0x81) ENGINE = MyISAM)
 drop table t1;
 create table t1 (a varchar(2) character set cp1250)
 partition by list columns (a)
@@ -18,8 +18,8 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` varchar(2) CHARACTER SET cp1250 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY LIST  COLUMNS(a)
+ PARTITION BY LIST  COLUMNS(a)
-(PARTITION p0 VALUES IN ('€') ENGINE = MyISAM) */
+(PARTITION p0 VALUES IN ('€') ENGINE = MyISAM)
 drop table t1;
 create table t1 (a varchar(1500), b varchar(1570))
 partition by list columns(a,b)
@@ -45,9 +45,9 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` varchar(2) CHARACTER SET ucs2 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50500 PARTITION BY LIST  COLUMNS(a)
+ PARTITION BY LIST  COLUMNS(a)
 (PARTITION p0 VALUES IN ('†') ENGINE = MyISAM,
- PARTITION p1 VALUES IN ('') ENGINE = MyISAM) */
+ PARTITION p1 VALUES IN ('') ENGINE = MyISAM)
 insert into t1 values ('');
 insert into t1 values (_ucs2 0x2020);
 drop table t1;

mysql-test/suite/archive/partition_archive.result

@@ -84,7 +84,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a) */
+ PARTITION BY HASH (a)
 drop table t1;
 CREATE TABLE t1(id MEDIUMINT NOT NULL AUTO_INCREMENT,
 f1 VARCHAR(25),
@@ -109,7 +109,7 @@ t1	CREATE TABLE `t1` (
   `f1` varchar(25) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=ARCHIVE AUTO_INCREMENT=101 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (id)
+ PARTITION BY RANGE (id)
 SUBPARTITION BY HASH (id)
 SUBPARTITIONS 2
 (PARTITION pa1 VALUES LESS THAN (10) ENGINE = ARCHIVE,
@@ -122,7 +122,7 @@ SUBPARTITIONS 2
  PARTITION pa8 VALUES LESS THAN (80) ENGINE = ARCHIVE,
  PARTITION pa9 VALUES LESS THAN (90) ENGINE = ARCHIVE,
  PARTITION pa10 VALUES LESS THAN (100) ENGINE = ARCHIVE,
- PARTITION pa11 VALUES LESS THAN MAXVALUE ENGINE = ARCHIVE) */
+ PARTITION pa11 VALUES LESS THAN MAXVALUE ENGINE = ARCHIVE)
 select count(*) from t1;
 count(*)
 100
@@ -138,8 +138,8 @@ t1	CREATE TABLE `t1` (
   `fld1` int(11) NOT NULL,
   PRIMARY KEY (`fld1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (fld1)
+ PARTITION BY HASH (fld1)
-PARTITIONS 5 */
+PARTITIONS 5
 ALTER TABLE t1 ENGINE= ARCHIVE;
 ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 #After the patch, the ENGINE is correctly displayed as MyISAM
@@ -149,8 +149,8 @@ t1	CREATE TABLE `t1` (
   `fld1` int(11) NOT NULL,
   PRIMARY KEY (`fld1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (fld1)
+ PARTITION BY HASH (fld1)
-PARTITIONS 5 */
+PARTITIONS 5
 #Cleanup.
 DROP TABLE t1;
 create database mysqltest1;

mysql-test/suite/encryption/r/encryption_force.result

@@ -31,8 +31,8 @@ Table	Create Table
 t4	CREATE TABLE `t4` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
-PARTITIONS 2 */
+PARTITIONS 2
 alter table t1 encrypted=no;
 ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
 alter table t2 encrypted=yes;

mysql-test/suite/engines/funcs/r/tc_partition_analyze.result

@@ -24,13 +24,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (c1)
+ PARTITION BY RANGE (c1)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
  PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
  PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 ANALYZE PARTITION p1,p2;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
@@ -48,13 +48,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (c1)
+ PARTITION BY RANGE (c1)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
  PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
  PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test

mysql-test/suite/engines/funcs/r/tc_partition_change_from_range_to_hash_key.result

@@ -34,8 +34,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -56,8 +56,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -97,8 +97,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -119,8 +119,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -160,8 +160,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -182,8 +182,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -223,8 +223,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -245,8 +245,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -286,8 +286,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -308,8 +308,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -349,8 +349,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -371,8 +371,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -412,8 +412,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -434,8 +434,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -475,8 +475,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -497,8 +497,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -538,8 +538,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -560,8 +560,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -601,8 +601,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -623,8 +623,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -664,8 +664,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -686,8 +686,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -727,8 +727,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -749,8 +749,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test

mysql-test/suite/engines/funcs/r/tc_partition_check.result

@@ -24,13 +24,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (c1)
+ PARTITION BY RANGE (c1)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
  PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
  PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 CHECK PARTITION p1,p2;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
@@ -48,13 +48,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (c1)
+ PARTITION BY RANGE (c1)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
  PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
  PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test

mysql-test/suite/engines/funcs/r/tc_partition_hash.result

@@ -9,8 +9,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 1 */
+PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -24,8 +24,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 1 */
+PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -39,8 +39,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 1 */
+PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -54,8 +54,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 1 */
+PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -69,8 +69,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 1 */
+PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -84,8 +84,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 1 */
+PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -99,8 +99,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 1 */
+PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -114,8 +114,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 1 */
+PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -129,8 +129,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 1 */
+PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -144,8 +144,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 1 */
+PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -159,8 +159,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 1 */
+PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -174,8 +174,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 1 */
+PARTITIONS 1
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -189,8 +189,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -204,8 +204,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -219,8 +219,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -234,8 +234,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -249,8 +249,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -264,8 +264,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -279,8 +279,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -294,8 +294,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -309,8 +309,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -324,8 +324,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -339,8 +339,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -354,8 +354,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -369,8 +369,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -384,8 +384,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -399,8 +399,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -414,8 +414,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -429,8 +429,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -444,8 +444,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -459,8 +459,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -474,8 +474,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -489,8 +489,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -504,8 +504,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -519,8 +519,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -534,8 +534,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 3 */
+PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -549,8 +549,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -564,8 +564,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -579,8 +579,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -594,8 +594,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -609,8 +609,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -624,8 +624,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -639,8 +639,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -654,8 +654,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -669,8 +669,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -684,8 +684,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -699,8 +699,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -714,8 +714,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -729,8 +729,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -744,8 +744,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -759,8 +759,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -774,8 +774,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -789,8 +789,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -804,8 +804,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -819,8 +819,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -834,8 +834,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -849,8 +849,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -864,8 +864,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -879,8 +879,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -894,8 +894,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -909,8 +909,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -924,8 +924,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -939,8 +939,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -954,8 +954,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -969,8 +969,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -984,8 +984,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -999,8 +999,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -1014,8 +1014,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -1029,8 +1029,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -1044,8 +1044,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -1059,8 +1059,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -1074,8 +1074,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -1089,8 +1089,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 50 */
+PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -1104,8 +1104,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 50 */
+PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -1119,8 +1119,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 50 */
+PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -1134,8 +1134,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 50 */
+PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -1149,8 +1149,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 50 */
+PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -1164,8 +1164,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 50 */
+PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -1179,8 +1179,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 50 */
+PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -1194,8 +1194,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 50 */
+PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -1209,8 +1209,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 50 */
+PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -1224,8 +1224,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 50 */
+PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -1239,8 +1239,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 50 */
+PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -1254,8 +1254,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 50 */
+PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test

mysql-test/suite/engines/funcs/r/tc_partition_hash_date_function.result

@@ -10,7 +10,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(c3)) */
+ PARTITION BY HASH (YEAR(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -25,7 +25,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(c3)) */
+ PARTITION BY HASH (YEAR(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -40,7 +40,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(c3)) */
+ PARTITION BY HASH (YEAR(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -55,7 +55,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(c3)) */
+ PARTITION BY HASH (YEAR(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -70,7 +70,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(c3)) */
+ PARTITION BY HASH (YEAR(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -85,7 +85,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(c3)) */
+ PARTITION BY HASH (YEAR(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -100,7 +100,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(c3)) */
+ PARTITION BY HASH (YEAR(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -115,7 +115,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(c3)) */
+ PARTITION BY HASH (YEAR(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -130,7 +130,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(c3)) */
+ PARTITION BY HASH (YEAR(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -145,7 +145,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(c3)) */
+ PARTITION BY HASH (YEAR(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -160,7 +160,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(c3)) */
+ PARTITION BY HASH (YEAR(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -175,7 +175,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(c3)) */
+ PARTITION BY HASH (YEAR(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -190,7 +190,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (MONTH(c3)) */
+ PARTITION BY HASH (MONTH(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -205,7 +205,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (MONTH(c3)) */
+ PARTITION BY HASH (MONTH(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -220,7 +220,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (MONTH(c3)) */
+ PARTITION BY HASH (MONTH(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -235,7 +235,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (MONTH(c3)) */
+ PARTITION BY HASH (MONTH(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -250,7 +250,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (MONTH(c3)) */
+ PARTITION BY HASH (MONTH(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -265,7 +265,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (MONTH(c3)) */
+ PARTITION BY HASH (MONTH(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -280,7 +280,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (MONTH(c3)) */
+ PARTITION BY HASH (MONTH(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -295,7 +295,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (MONTH(c3)) */
+ PARTITION BY HASH (MONTH(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -310,7 +310,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (MONTH(c3)) */
+ PARTITION BY HASH (MONTH(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -325,7 +325,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (MONTH(c3)) */
+ PARTITION BY HASH (MONTH(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -340,7 +340,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (MONTH(c3)) */
+ PARTITION BY HASH (MONTH(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -355,7 +355,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (MONTH(c3)) */
+ PARTITION BY HASH (MONTH(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -370,7 +370,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAY(c3)) */
+ PARTITION BY HASH (DAY(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -385,7 +385,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAY(c3)) */
+ PARTITION BY HASH (DAY(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -400,7 +400,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAY(c3)) */
+ PARTITION BY HASH (DAY(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -415,7 +415,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAY(c3)) */
+ PARTITION BY HASH (DAY(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -430,7 +430,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAY(c3)) */
+ PARTITION BY HASH (DAY(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -445,7 +445,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAY(c3)) */
+ PARTITION BY HASH (DAY(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -460,7 +460,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAY(c3)) */
+ PARTITION BY HASH (DAY(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -475,7 +475,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAY(c3)) */
+ PARTITION BY HASH (DAY(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -490,7 +490,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAY(c3)) */
+ PARTITION BY HASH (DAY(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -505,7 +505,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAY(c3)) */
+ PARTITION BY HASH (DAY(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -520,7 +520,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAY(c3)) */
+ PARTITION BY HASH (DAY(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -535,7 +535,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAY(c3)) */
+ PARTITION BY HASH (DAY(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -550,7 +550,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAYOFWEEK(c3)) */
+ PARTITION BY HASH (DAYOFWEEK(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -565,7 +565,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAYOFWEEK(c3)) */
+ PARTITION BY HASH (DAYOFWEEK(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -580,7 +580,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAYOFWEEK(c3)) */
+ PARTITION BY HASH (DAYOFWEEK(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -595,7 +595,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAYOFWEEK(c3)) */
+ PARTITION BY HASH (DAYOFWEEK(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -610,7 +610,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAYOFWEEK(c3)) */
+ PARTITION BY HASH (DAYOFWEEK(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -625,7 +625,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAYOFWEEK(c3)) */
+ PARTITION BY HASH (DAYOFWEEK(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -640,7 +640,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAYOFWEEK(c3)) */
+ PARTITION BY HASH (DAYOFWEEK(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -655,7 +655,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAYOFWEEK(c3)) */
+ PARTITION BY HASH (DAYOFWEEK(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -670,7 +670,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAYOFWEEK(c3)) */
+ PARTITION BY HASH (DAYOFWEEK(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -685,7 +685,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAYOFWEEK(c3)) */
+ PARTITION BY HASH (DAYOFWEEK(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -700,7 +700,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAYOFWEEK(c3)) */
+ PARTITION BY HASH (DAYOFWEEK(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -715,7 +715,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAYOFWEEK(c3)) */
+ PARTITION BY HASH (DAYOFWEEK(c3))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test

mysql-test/suite/engines/funcs/r/tc_partition_key.result

@@ -9,8 +9,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -24,8 +24,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -39,8 +39,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -54,8 +54,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -69,8 +69,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -84,8 +84,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -99,8 +99,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -114,8 +114,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -129,8 +129,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -144,8 +144,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -159,8 +159,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -174,8 +174,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -189,8 +189,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -204,8 +204,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -219,8 +219,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -234,8 +234,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -249,8 +249,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -264,8 +264,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -279,8 +279,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -294,8 +294,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -309,8 +309,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -324,8 +324,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -339,8 +339,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -354,8 +354,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -369,8 +369,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -384,8 +384,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -399,8 +399,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -414,8 +414,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -429,8 +429,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -444,8 +444,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -459,8 +459,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -474,8 +474,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -489,8 +489,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -504,8 +504,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -519,8 +519,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -534,8 +534,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -549,8 +549,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -564,8 +564,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -579,8 +579,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -594,8 +594,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -609,8 +609,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -624,8 +624,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -639,8 +639,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -654,8 +654,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -669,8 +669,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -684,8 +684,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -699,8 +699,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -714,8 +714,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test

mysql-test/suite/engines/funcs/r/tc_partition_linear_key.result

@@ -9,8 +9,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -24,8 +24,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -39,8 +39,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -54,8 +54,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -69,8 +69,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -84,8 +84,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -99,8 +99,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -114,8 +114,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -129,8 +129,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -144,8 +144,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -159,8 +159,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -174,8 +174,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -189,8 +189,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -204,8 +204,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -219,8 +219,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -234,8 +234,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -249,8 +249,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -264,8 +264,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -279,8 +279,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -294,8 +294,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -309,8 +309,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -324,8 +324,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -339,8 +339,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -354,8 +354,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 4 */
+PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -369,8 +369,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -384,8 +384,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -399,8 +399,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -414,8 +414,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -429,8 +429,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -444,8 +444,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -459,8 +459,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -474,8 +474,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -489,8 +489,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -504,8 +504,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -519,8 +519,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -534,8 +534,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 5 */
+PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -549,8 +549,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -564,8 +564,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -579,8 +579,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -594,8 +594,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -609,8 +609,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -624,8 +624,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -639,8 +639,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -654,8 +654,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -669,8 +669,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -684,8 +684,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -699,8 +699,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -714,8 +714,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 99 */
+PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test

mysql-test/suite/engines/funcs/r/tc_partition_optimize.result

@@ -24,13 +24,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (c1)
+ PARTITION BY RANGE (c1)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
  PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
  PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 OPTIMIZE PARTITION p1,p2;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -46,13 +46,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (c1)
+ PARTITION BY RANGE (c1)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
  PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
  PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test

mysql-test/suite/engines/funcs/r/tc_partition_rebuild.result

@@ -24,13 +24,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (c1)
+ PARTITION BY RANGE (c1)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
  PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
  PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 REBUILD PARTITION p1,p2;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -46,13 +46,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (c1)
+ PARTITION BY RANGE (c1)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
  PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
  PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test

mysql-test/suite/engines/funcs/r/tc_partition_remove.result

@@ -21,7 +21,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1) */
+ PARTITION BY HASH (c1)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -60,7 +60,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1) */
+ PARTITION BY HASH (c1)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -99,7 +99,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1) */
+ PARTITION BY HASH (c1)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -138,7 +138,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1) */
+ PARTITION BY HASH (c1)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -177,7 +177,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1) */
+ PARTITION BY HASH (c1)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -216,7 +216,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1) */
+ PARTITION BY HASH (c1)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -259,7 +259,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1) */
+ PARTITION BY HASH (c1)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -298,7 +298,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1) */
+ PARTITION BY HASH (c1)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -337,7 +337,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1) */
+ PARTITION BY HASH (c1)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -376,7 +376,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1) */
+ PARTITION BY HASH (c1)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -415,7 +415,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1) */
+ PARTITION BY HASH (c1)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -454,7 +454,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1) */
+ PARTITION BY HASH (c1)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2

mysql-test/suite/engines/funcs/r/tc_partition_reorg_divide.result

@@ -44,12 +44,12 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
  PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION s2;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION s1;
@@ -71,11 +71,11 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -125,12 +125,12 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
  PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION s2;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION s1;
@@ -152,11 +152,11 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -206,12 +206,12 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
  PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION s2;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION s1;
@@ -233,11 +233,11 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -287,12 +287,12 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
  PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION s2;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION s1;
@@ -314,11 +314,11 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -368,12 +368,12 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
  PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION s2;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION s1;
@@ -395,11 +395,11 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -449,12 +449,12 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
  PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION s2;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION s1;
@@ -476,11 +476,11 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test

mysql-test/suite/engines/funcs/r/tc_partition_reorg_hash_key.result

@@ -19,8 +19,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -41,8 +41,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 20 */
+PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SHOW TABLES;
 Tables_in_test
@@ -63,16 +63,16 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -97,8 +97,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -119,8 +119,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 20 */
+PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -141,16 +141,16 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -175,8 +175,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -197,8 +197,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 20 */
+PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -219,16 +219,16 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -253,8 +253,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -275,8 +275,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 20 */
+PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -297,16 +297,16 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -331,8 +331,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -353,8 +353,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 20 */
+PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -375,16 +375,16 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -409,8 +409,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -431,8 +431,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 20 */
+PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -453,16 +453,16 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -487,8 +487,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -509,8 +509,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 20 */
+PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -531,16 +531,16 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -565,8 +565,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -587,8 +587,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 20 */
+PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -609,16 +609,16 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -643,8 +643,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -665,8 +665,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 20 */
+PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -687,16 +687,16 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -721,8 +721,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -743,8 +743,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 20 */
+PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -765,16 +765,16 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -799,8 +799,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -821,8 +821,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 20 */
+PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -843,16 +843,16 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -877,8 +877,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -899,8 +899,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 20 */
+PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -921,16 +921,16 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (c1)
+ PARTITION BY KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -955,8 +955,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -977,8 +977,8 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 20 */
+PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -999,16 +999,16 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -1033,8 +1033,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -1055,8 +1055,8 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 20 */
+PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -1077,16 +1077,16 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -1111,8 +1111,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -1133,8 +1133,8 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 20 */
+PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -1155,16 +1155,16 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -1189,8 +1189,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -1211,8 +1211,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 20 */
+PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -1233,16 +1233,16 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -1267,8 +1267,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -1289,8 +1289,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 20 */
+PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -1311,16 +1311,16 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -1345,8 +1345,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 10 */
+PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -1367,8 +1367,8 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 20 */
+PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -1389,16 +1389,16 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test

mysql-test/suite/engines/funcs/r/tc_partition_reorg_merge.result

@@ -41,10 +41,10 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
  PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION m1;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION m0;
@@ -63,9 +63,9 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -112,10 +112,10 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
  PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION m1;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION m0;
@@ -134,9 +134,9 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -183,10 +183,10 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
  PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION m1;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION m0;
@@ -205,9 +205,9 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -254,10 +254,10 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
  PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION m1;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION m0;
@@ -276,9 +276,9 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -325,10 +325,10 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
  PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION m1;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION m0;
@@ -347,9 +347,9 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -396,10 +396,10 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
  PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION m1;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION m0;
@@ -418,9 +418,9 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( c1)
+ PARTITION BY RANGE ( c1)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test

mysql-test/suite/engines/funcs/r/tc_partition_repair.result

@@ -24,13 +24,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (c1)
+ PARTITION BY RANGE (c1)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
  PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
  PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 REPAIR PARTITION p1,p2;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -46,13 +46,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (c1)
+ PARTITION BY RANGE (c1)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
  PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
  PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test

mysql-test/suite/engines/funcs/r/tc_partition_sub1.result

@@ -45,12 +45,12 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( YEAR(purchased))
+ PARTITION BY RANGE ( YEAR(purchased))
 SUBPARTITION BY HASH ( TO_DAYS(purchased))
 SUBPARTITIONS 2
 (PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -100,12 +100,12 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( YEAR(purchased))
+ PARTITION BY RANGE ( YEAR(purchased))
 SUBPARTITION BY HASH ( TO_DAYS(purchased))
 SUBPARTITIONS 2
 (PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -155,12 +155,12 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( YEAR(purchased))
+ PARTITION BY RANGE ( YEAR(purchased))
 SUBPARTITION BY HASH ( TO_DAYS(purchased))
 SUBPARTITIONS 2
 (PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -210,12 +210,12 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( YEAR(purchased))
+ PARTITION BY RANGE ( YEAR(purchased))
 SUBPARTITION BY HASH ( TO_DAYS(purchased))
 SUBPARTITIONS 2
 (PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -265,12 +265,12 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( YEAR(purchased))
+ PARTITION BY RANGE ( YEAR(purchased))
 SUBPARTITION BY HASH ( TO_DAYS(purchased))
 SUBPARTITIONS 2
 (PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -320,12 +320,12 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( YEAR(purchased))
+ PARTITION BY RANGE ( YEAR(purchased))
 SUBPARTITION BY HASH ( TO_DAYS(purchased))
 SUBPARTITIONS 2
 (PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test

mysql-test/suite/engines/funcs/r/tc_partition_sub2.result

@@ -53,7 +53,7 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( YEAR(purchased))
+ PARTITION BY RANGE ( YEAR(purchased))
 SUBPARTITION BY HASH ( TO_DAYS(purchased))
 (PARTITION p0 VALUES LESS THAN (1990)
  (SUBPARTITION s0 ENGINE = ENGINE,
@@ -63,7 +63,7 @@ SUBPARTITION BY HASH ( TO_DAYS(purchased))
   SUBPARTITION s3 ENGINE = ENGINE),
  PARTITION p2 VALUES LESS THAN MAXVALUE
  (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE)) */
+  SUBPARTITION s5 ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -121,7 +121,7 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( YEAR(purchased))
+ PARTITION BY RANGE ( YEAR(purchased))
 SUBPARTITION BY HASH ( TO_DAYS(purchased))
 (PARTITION p0 VALUES LESS THAN (1990)
  (SUBPARTITION s0 ENGINE = ENGINE,
@@ -131,7 +131,7 @@ SUBPARTITION BY HASH ( TO_DAYS(purchased))
   SUBPARTITION s3 ENGINE = ENGINE),
  PARTITION p2 VALUES LESS THAN MAXVALUE
  (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE)) */
+  SUBPARTITION s5 ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -189,7 +189,7 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( YEAR(purchased))
+ PARTITION BY RANGE ( YEAR(purchased))
 SUBPARTITION BY HASH ( TO_DAYS(purchased))
 (PARTITION p0 VALUES LESS THAN (1990)
  (SUBPARTITION s0 ENGINE = ENGINE,
@@ -199,7 +199,7 @@ SUBPARTITION BY HASH ( TO_DAYS(purchased))
   SUBPARTITION s3 ENGINE = ENGINE),
  PARTITION p2 VALUES LESS THAN MAXVALUE
  (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE)) */
+  SUBPARTITION s5 ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -257,7 +257,7 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( YEAR(purchased))
+ PARTITION BY RANGE ( YEAR(purchased))
 SUBPARTITION BY HASH ( TO_DAYS(purchased))
 (PARTITION p0 VALUES LESS THAN (1990)
  (SUBPARTITION s0 ENGINE = ENGINE,
@@ -267,7 +267,7 @@ SUBPARTITION BY HASH ( TO_DAYS(purchased))
   SUBPARTITION s3 ENGINE = ENGINE),
  PARTITION p2 VALUES LESS THAN MAXVALUE
  (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE)) */
+  SUBPARTITION s5 ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -325,7 +325,7 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( YEAR(purchased))
+ PARTITION BY RANGE ( YEAR(purchased))
 SUBPARTITION BY HASH ( TO_DAYS(purchased))
 (PARTITION p0 VALUES LESS THAN (1990)
  (SUBPARTITION s0 ENGINE = ENGINE,
@@ -335,7 +335,7 @@ SUBPARTITION BY HASH ( TO_DAYS(purchased))
   SUBPARTITION s3 ENGINE = ENGINE),
  PARTITION p2 VALUES LESS THAN MAXVALUE
  (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE)) */
+  SUBPARTITION s5 ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -393,7 +393,7 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ( YEAR(purchased))
+ PARTITION BY RANGE ( YEAR(purchased))
 SUBPARTITION BY HASH ( TO_DAYS(purchased))
 (PARTITION p0 VALUES LESS THAN (1990)
  (SUBPARTITION s0 ENGINE = ENGINE,
@@ -403,7 +403,7 @@ SUBPARTITION BY HASH ( TO_DAYS(purchased))
   SUBPARTITION s3 ENGINE = ENGINE),
  PARTITION p2 VALUES LESS THAN MAXVALUE
  (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE)) */
+  SUBPARTITION s5 ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test

mysql-test/suite/engines/funcs/r/tc_partition_value.result

@@ -15,13 +15,13 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (c1)
+ PARTITION BY RANGE (c1)
 (PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE,
  PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE,
  PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -41,13 +41,13 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (c1)
+ PARTITION BY RANGE (c1)
 (PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE,
  PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE,
  PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -67,13 +67,13 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (c1)
+ PARTITION BY RANGE (c1)
 (PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE,
  PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE,
  PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -93,13 +93,13 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (c1)
+ PARTITION BY RANGE (c1)
 (PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE,
  PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE,
  PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -119,13 +119,13 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (c1)
+ PARTITION BY RANGE (c1)
 (PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE,
  PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE,
  PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE,
  PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE,
  PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE) */
+ PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test

mysql-test/suite/engines/funcs/r/tc_partition_value_specific.result

@@ -13,11 +13,11 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (c1)
+ PARTITION BY LIST (c1)
 (PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
  PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
  PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
- PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE) */
+ PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -35,11 +35,11 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (c1)
+ PARTITION BY LIST (c1)
 (PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
  PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
  PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
- PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE) */
+ PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -57,11 +57,11 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (c1)
+ PARTITION BY LIST (c1)
 (PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
  PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
  PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
- PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE) */
+ PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -79,11 +79,11 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (c1)
+ PARTITION BY LIST (c1)
 (PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
  PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
  PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
- PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE) */
+ PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -101,11 +101,11 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (c1)
+ PARTITION BY LIST (c1)
 (PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
  PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
  PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
- PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE) */
+ PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test

mysql-test/suite/federated/federated_partition.result

@@ -21,9 +21,9 @@ t1	CREATE TABLE `t1` (
   `s1` int(11) NOT NULL,
   PRIMARY KEY (`s1`)
 ) ENGINE=FEDERATED DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (s1)
+ PARTITION BY LIST (s1)
 (PARTITION p1 VALUES IN (1,3) CONNECTION = 'mysql://root@127.0.0.1:SLAVE_PORT/federated/t1_1' ENGINE = FEDERATED,
- PARTITION p2 VALUES IN (2,4) CONNECTION = 'mysql://root@127.0.0.1:SLAVE_PORT/federated/t1_2' ENGINE = FEDERATED) */
+ PARTITION p2 VALUES IN (2,4) CONNECTION = 'mysql://root@127.0.0.1:SLAVE_PORT/federated/t1_2' ENGINE = FEDERATED)
 insert into t1 values (1), (2), (3), (4);
 select * from t1;
 s1

mysql-test/suite/galera/r/partition.result

@@ -56,10 +56,10 @@ t1	CREATE TABLE `t1` (
   `i` int(10) unsigned NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`i`)
 ) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (i)
+ PARTITION BY RANGE (i)
 (PARTITION p1 VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION p2 VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
+ PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
 SHOW CREATE TABLE p1;
 Table	Create Table
 p1	CREATE TABLE `p1` (
@@ -93,9 +93,9 @@ t1	CREATE TABLE `t1` (
   `i` int(10) unsigned NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`i`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (i)
+ PARTITION BY RANGE (i)
 (PARTITION p1 VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
+ PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
 
 # On node_2
 connection node_2;
@@ -105,9 +105,9 @@ t1	CREATE TABLE `t1` (
   `i` int(10) unsigned NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`i`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (i)
+ PARTITION BY RANGE (i)
 (PARTITION p1 VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
+ PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
 DROP TABLE t1, p1;
 #
 # MDEV-5146: Bulk loads into partitioned table not working

mysql-test/suite/innodb_zip/r/restart.result

@@ -145,10 +145,10 @@ t6_restart	CREATE TABLE `t6_restart` (
   `c5` text DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
 (PARTITION p0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
  PARTITION p1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
- PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB) */
+ PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)
 SELECT count(*) FROM t6_restart;
 count(*)
 16
@@ -181,14 +181,14 @@ t7_restart	CREATE TABLE `t7_restart` (
   `c5` text DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
-/*!50100 PARTITION BY RANGE (c1)
+ PARTITION BY RANGE (c1)
 SUBPARTITION BY HASH (c1)
 (PARTITION p0 VALUES LESS THAN (10)
  (SUBPARTITION s0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
   SUBPARTITION s1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB),
  PARTITION p1 VALUES LESS THAN MAXVALUE
  (SUBPARTITION s2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
-  SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)) */
+  SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB))
 SELECT count(*) FROM t7_restart;
 count(*)
 16
@@ -325,10 +325,10 @@ t6_restart	CREATE TABLE `t6_restart` (
   `c5` text DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
 (PARTITION p0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
  PARTITION p1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
- PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB) */
+ PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)
 SHOW CREATE TABLE t7_restart;
 Table	Create Table
 t7_restart	CREATE TABLE `t7_restart` (
@@ -339,14 +339,14 @@ t7_restart	CREATE TABLE `t7_restart` (
   `c5` text DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
-/*!50100 PARTITION BY RANGE (c1)
+ PARTITION BY RANGE (c1)
 SUBPARTITION BY HASH (c1)
 (PARTITION p0 VALUES LESS THAN (10)
  (SUBPARTITION s0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
   SUBPARTITION s1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB),
  PARTITION p1 VALUES LESS THAN MAXVALUE
  (SUBPARTITION s2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
-  SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)) */
+  SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB))
 INSERT INTO t1_restart (SELECT 0, c2, c3, c4, c5 FROM t1_restart);
 INSERT INTO t2_restart (SELECT 0, c2, c3, c4, c5 FROM t2_restart);
 INSERT INTO t3_restart (SELECT 0, c2, c3, c4, c5 FROM t3_restart);
@@ -456,10 +456,10 @@ t6_restart	CREATE TABLE `t6_restart` (
   `c5` text DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
 (PARTITION p0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
  PARTITION p1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
- PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB) */
+ PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)
 SELECT count(*) FROM t7_restart;
 count(*)
 9
@@ -473,14 +473,14 @@ t7_restart	CREATE TABLE `t7_restart` (
   `c5` text DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
-/*!50100 PARTITION BY RANGE (c1)
+ PARTITION BY RANGE (c1)
 SUBPARTITION BY HASH (c1)
 (PARTITION p0 VALUES LESS THAN (10)
  (SUBPARTITION s0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
   SUBPARTITION s1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB),
  PARTITION p1 VALUES LESS THAN MAXVALUE
  (SUBPARTITION s2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
-  SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)) */
+  SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB))
 #
 # Shutdown the server and make a backup of a tablespace
 #
@@ -555,10 +555,10 @@ t6_restart	CREATE TABLE `t6_restart` (
   `c5` text DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
 (PARTITION p0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
  PARTITION p1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
- PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB) */
+ PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)
 SELECT count(*) FROM t7_restart;
 count(*)
 9
@@ -572,14 +572,14 @@ t7_restart	CREATE TABLE `t7_restart` (
   `c5` text DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
-/*!50100 PARTITION BY RANGE (c1)
+ PARTITION BY RANGE (c1)
 SUBPARTITION BY HASH (c1)
 (PARTITION p0 VALUES LESS THAN (10)
  (SUBPARTITION s0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
   SUBPARTITION s1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB),
  PARTITION p1 VALUES LESS THAN MAXVALUE
  (SUBPARTITION s2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
-  SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)) */
+  SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB))
 #
 # Try to rename a tablespace to a file that already exists
 #
@@ -657,10 +657,10 @@ t66_restart	CREATE TABLE `t66_restart` (
   `c5` text DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=53 DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
 (PARTITION p0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
  PARTITION p1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
- PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB) */
+ PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)
 INSERT INTO t77_restart (SELECT 0, c2, c3, c4, c5 FROM t77_restart);
 SELECT count(*) FROM t77_restart;
 count(*)
@@ -675,14 +675,14 @@ t77_restart	CREATE TABLE `t77_restart` (
   `c5` text DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
-/*!50100 PARTITION BY RANGE (c1)
+ PARTITION BY RANGE (c1)
 SUBPARTITION BY HASH (c1)
 (PARTITION p0 VALUES LESS THAN (10)
  (SUBPARTITION s0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
   SUBPARTITION s1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB),
  PARTITION p1 VALUES LESS THAN MAXVALUE
  (SUBPARTITION s2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
-  SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)) */
+  SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB))
 ---- MYSQL_DATA_DIR/test
 t4_restart.frm
 t4_restart.ibd
@@ -753,10 +753,10 @@ t66_restart	CREATE TABLE `t66_restart` (
   `c5` text DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=95 DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
 (PARTITION p0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
  PARTITION p1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
- PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB) */
+ PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)
 INSERT INTO t77_restart (SELECT 0, c2, c3, c4, c5 FROM t77_restart);
 SELECT count(*) FROM t77_restart;
 count(*)
@@ -771,14 +771,14 @@ t77_restart	CREATE TABLE `t77_restart` (
   `c5` text DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=37 DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
-/*!50100 PARTITION BY RANGE (c1)
+ PARTITION BY RANGE (c1)
 SUBPARTITION BY HASH (c1)
 (PARTITION p0 VALUES LESS THAN (10)
  (SUBPARTITION s0 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
   SUBPARTITION s1 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB),
  PARTITION p1 VALUES LESS THAN MAXVALUE
  (SUBPARTITION s2 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
-  SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB)) */
+  SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB))
 #
 # Shutdown the server
 #
@@ -898,10 +898,10 @@ t66_restart	CREATE TABLE `t66_restart` (
   `c5` text DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=179 DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
 (PARTITION p0 DATA DIRECTORY = 'MYSQL_TMP_DIR/new_dir' ENGINE = InnoDB,
  PARTITION p1 DATA DIRECTORY = 'MYSQL_TMP_DIR/new_dir' ENGINE = InnoDB,
- PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/new_dir' ENGINE = InnoDB) */
+ PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/new_dir' ENGINE = InnoDB)
 INSERT INTO t77_restart (SELECT 0, c2, c3, c4, c5 FROM t77_restart);
 SELECT count(*) FROM t77_restart;
 count(*)
@@ -916,14 +916,14 @@ t77_restart	CREATE TABLE `t77_restart` (
   `c5` text DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=73 DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
-/*!50100 PARTITION BY RANGE (c1)
+ PARTITION BY RANGE (c1)
 SUBPARTITION BY HASH (c1)
 (PARTITION p0 VALUES LESS THAN (10)
  (SUBPARTITION s0 DATA DIRECTORY = 'MYSQL_TMP_DIR/new_dir' ENGINE = InnoDB,
   SUBPARTITION s1 DATA DIRECTORY = 'MYSQL_TMP_DIR/new_dir' ENGINE = InnoDB),
  PARTITION p1 VALUES LESS THAN MAXVALUE
  (SUBPARTITION s2 DATA DIRECTORY = 'MYSQL_TMP_DIR/new_dir' ENGINE = InnoDB,
-  SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/new_dir' ENGINE = InnoDB)) */
+  SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/new_dir' ENGINE = InnoDB))
 #
 # Shutdown the server
 #
@@ -1033,10 +1033,10 @@ t66_restart	CREATE TABLE `t66_restart` (
   `c5` text DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=347 DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION p1 ENGINE = InnoDB,
- PARTITION p2 ENGINE = InnoDB) */
+ PARTITION p2 ENGINE = InnoDB)
 INSERT INTO t77_restart (SELECT 0, c2, c3, c4, c5 FROM t77_restart);
 SELECT count(*) FROM t77_restart;
 count(*)
@@ -1051,14 +1051,14 @@ t77_restart	CREATE TABLE `t77_restart` (
   `c5` text DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=145 DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
-/*!50100 PARTITION BY RANGE (c1)
+ PARTITION BY RANGE (c1)
 SUBPARTITION BY HASH (c1)
 (PARTITION p0 VALUES LESS THAN (10)
  (SUBPARTITION s0 ENGINE = InnoDB,
   SUBPARTITION s1 ENGINE = InnoDB),
  PARTITION p1 VALUES LESS THAN MAXVALUE
  (SUBPARTITION s2 ENGINE = InnoDB,
-  SUBPARTITION s3 ENGINE = InnoDB)) */
+  SUBPARTITION s3 ENGINE = InnoDB))
 #
 # Cleanup
 #

mysql-test/suite/parts/r/part_supported_sql_func_innodb.result

@@ -620,7 +620,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (abs(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB,
@@ -628,7 +628,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB)
 select * from t55 order by colint;
 colint	col1
 1	15
@@ -2317,7 +2317,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (mod(col1,10))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB,
@@ -2325,7 +2325,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB)
 select * from t55 order by colint;
 colint	col1
 1	15
@@ -3667,7 +3667,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (day(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB,
@@ -3675,7 +3675,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-05
@@ -4184,7 +4184,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (dayofmonth(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB,
@@ -4192,7 +4192,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-05
@@ -4701,7 +4701,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (dayofweek(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB,
@@ -4709,7 +4709,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
@@ -5230,7 +5230,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (dayofyear(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB,
@@ -5238,7 +5238,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
@@ -5749,7 +5749,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (extract(month from col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB,
@@ -5757,7 +5757,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
@@ -6268,7 +6268,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` time DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (hour(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB,
@@ -6276,7 +6276,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB)
 select * from t55 order by colint;
 colint	col1
 1	09:09:15
@@ -6793,7 +6793,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` time(6) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (microsecond(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB,
@@ -6801,7 +6801,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB)
 select * from t55 order by colint;
 colint	col1
 1	05:30:34.000037
@@ -7314,7 +7314,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` time DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (minute(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB,
@@ -7322,7 +7322,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB)
 select * from t55 order by colint;
 colint	col1
 1	10:24:23
@@ -7845,7 +7845,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` time DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (second(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB,
@@ -7853,7 +7853,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB)
 select * from t55 order by colint;
 colint	col1
 1	09:09:15
@@ -8376,7 +8376,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (month(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB,
@@ -8384,7 +8384,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
@@ -8901,7 +8901,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (quarter(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB,
@@ -8909,7 +8909,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
@@ -9424,7 +9424,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (weekday(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB,
@@ -9432,7 +9432,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
@@ -9945,7 +9945,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (year(col1)-1990)
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB,
@@ -9953,7 +9953,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
@@ -10470,7 +10470,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (yearweek(col1)-200600)
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB,
@@ -10478,7 +10478,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = InnoDB,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = InnoDB,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03

mysql-test/suite/parts/r/part_supported_sql_func_myisam.result

@@ -620,7 +620,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (abs(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM,
@@ -628,7 +628,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM)
 select * from t55 order by colint;
 colint	col1
 1	15
@@ -2317,7 +2317,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (mod(col1,10))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM,
@@ -2325,7 +2325,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM)
 select * from t55 order by colint;
 colint	col1
 1	15
@@ -3667,7 +3667,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (day(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM,
@@ -3675,7 +3675,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-05
@@ -4184,7 +4184,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (dayofmonth(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM,
@@ -4192,7 +4192,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-05
@@ -4701,7 +4701,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (dayofweek(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM,
@@ -4709,7 +4709,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
@@ -5230,7 +5230,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (dayofyear(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM,
@@ -5238,7 +5238,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
@@ -5749,7 +5749,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (extract(month from col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM,
@@ -5757,7 +5757,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
@@ -6268,7 +6268,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` time DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (hour(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM,
@@ -6276,7 +6276,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM)
 select * from t55 order by colint;
 colint	col1
 1	09:09:15
@@ -6793,7 +6793,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` time(6) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (microsecond(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM,
@@ -6801,7 +6801,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM)
 select * from t55 order by colint;
 colint	col1
 1	05:30:34.000037
@@ -7314,7 +7314,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` time DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (minute(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM,
@@ -7322,7 +7322,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM)
 select * from t55 order by colint;
 colint	col1
 1	10:24:23
@@ -7845,7 +7845,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` time DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (second(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM,
@@ -7853,7 +7853,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM)
 select * from t55 order by colint;
 colint	col1
 1	09:09:15
@@ -8376,7 +8376,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (month(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM,
@@ -8384,7 +8384,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
@@ -8901,7 +8901,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (quarter(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM,
@@ -8909,7 +8909,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
@@ -9424,7 +9424,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (weekday(col1))
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM,
@@ -9432,7 +9432,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
@@ -9945,7 +9945,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (year(col1)-1990)
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM,
@@ -9953,7 +9953,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
@@ -10470,7 +10470,7 @@ t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (colint)
+ PARTITION BY LIST (colint)
 SUBPARTITION BY HASH (yearweek(col1)-200600)
 SUBPARTITIONS 5
 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM,
@@ -10478,7 +10478,7 @@ SUBPARTITIONS 5
  PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM,
  PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM,
  PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM,
- PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) */
+ PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM)
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03

mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result

@@ -75,8 +75,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -567,8 +567,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1067,7 +1067,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -1075,7 +1075,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1572,13 +1572,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2071,13 +2071,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2574,7 +2574,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -2587,7 +2587,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3084,7 +3084,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -3097,7 +3097,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3592,12 +3592,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4089,8 +4089,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4581,8 +4581,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5081,7 +5081,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -5089,7 +5089,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5586,13 +5586,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6085,13 +6085,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6588,7 +6588,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -6601,7 +6601,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7098,7 +7098,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -7111,7 +7111,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7606,12 +7606,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8104,8 +8104,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8612,8 +8612,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9128,7 +9128,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -9136,7 +9136,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9649,13 +9649,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10164,13 +10164,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10683,7 +10683,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -10696,7 +10696,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11209,7 +11209,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -11222,7 +11222,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11733,12 +11733,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12246,8 +12246,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12754,8 +12754,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13270,7 +13270,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -13278,7 +13278,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13791,13 +13791,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14306,13 +14306,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14825,7 +14825,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -14838,7 +14838,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15351,7 +15351,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -15364,7 +15364,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15875,12 +15875,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16390,8 +16390,8 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16883,8 +16883,8 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17384,7 +17384,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -17392,7 +17392,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17890,13 +17890,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18390,13 +18390,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18894,7 +18894,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -18907,7 +18907,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19405,7 +19405,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -19418,7 +19418,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19914,12 +19914,12 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20412,8 +20412,8 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -20905,8 +20905,8 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21406,7 +21406,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -21414,7 +21414,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -21912,13 +21912,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22412,13 +22412,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -22916,7 +22916,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -22929,7 +22929,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23427,7 +23427,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -23440,7 +23440,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -23936,12 +23936,12 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24434,8 +24434,8 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -24927,8 +24927,8 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25428,7 +25428,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -25436,7 +25436,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -25934,13 +25934,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -26434,13 +26434,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -26938,7 +26938,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -26951,7 +26951,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27449,7 +27449,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -27462,7 +27462,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -27958,12 +27958,12 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1

mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result

@@ -75,8 +75,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -592,8 +592,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -1123,7 +1123,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -1131,7 +1131,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -1665,13 +1665,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -2197,13 +2197,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -2737,7 +2737,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -2750,7 +2750,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -3284,7 +3284,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -3297,7 +3297,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -3829,12 +3829,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD
@@ -4365,8 +4365,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -4882,8 +4882,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -5413,7 +5413,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -5421,7 +5421,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -5955,13 +5955,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -6487,13 +6487,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -7027,7 +7027,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -7040,7 +7040,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -7574,7 +7574,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -7587,7 +7587,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -8119,12 +8119,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD

mysql-test/suite/parts/r/partition_alter1_1_innodb.result

@@ -393,8 +393,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -885,8 +885,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1385,7 +1385,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -1393,7 +1393,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1890,13 +1890,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2389,13 +2389,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2894,7 +2894,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -2907,7 +2907,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3404,7 +3404,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -3417,7 +3417,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3912,12 +3912,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4409,8 +4409,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4901,8 +4901,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5401,7 +5401,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -5409,7 +5409,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5906,13 +5906,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6405,13 +6405,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6910,7 +6910,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -6923,7 +6923,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7420,7 +7420,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -7433,7 +7433,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7928,12 +7928,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8426,8 +8426,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8934,8 +8934,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9450,7 +9450,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -9458,7 +9458,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9971,13 +9971,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10486,13 +10486,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11007,7 +11007,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -11020,7 +11020,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11533,7 +11533,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -11546,7 +11546,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12057,12 +12057,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12570,8 +12570,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13078,8 +13078,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13594,7 +13594,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -13602,7 +13602,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14115,13 +14115,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14630,13 +14630,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15151,7 +15151,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -15164,7 +15164,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15677,7 +15677,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -15690,7 +15690,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16201,12 +16201,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1

mysql-test/suite/parts/r/partition_alter1_1_myisam.result

@@ -234,8 +234,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -751,8 +751,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -1282,7 +1282,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -1290,7 +1290,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -1824,13 +1824,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -2356,13 +2356,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -2898,7 +2898,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -2911,7 +2911,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -3445,7 +3445,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -3458,7 +3458,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -3990,12 +3990,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD
@@ -4526,8 +4526,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -5043,8 +5043,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -5574,7 +5574,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -5582,7 +5582,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -6116,13 +6116,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -6648,13 +6648,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -7190,7 +7190,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -7203,7 +7203,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -7737,7 +7737,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -7750,7 +7750,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -8282,12 +8282,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD

mysql-test/suite/parts/r/partition_alter1_2_myisam.result

@@ -72,8 +72,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -537,8 +537,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -1016,7 +1016,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -1024,7 +1024,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -1506,13 +1506,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -1986,13 +1986,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -2476,7 +2476,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -2489,7 +2489,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -2971,7 +2971,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -2984,7 +2984,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -3464,12 +3464,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD
@@ -3952,8 +3952,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -4417,8 +4417,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -4896,7 +4896,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -4904,7 +4904,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -5386,13 +5386,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -5866,13 +5866,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -6354,7 +6354,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -6367,7 +6367,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -6849,7 +6849,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -6862,7 +6862,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -7342,12 +7342,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD
@@ -7826,8 +7826,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -8291,8 +8291,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -8770,7 +8770,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -8778,7 +8778,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -9260,13 +9260,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -9740,13 +9740,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -10228,7 +10228,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -10241,7 +10241,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -10723,7 +10723,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -10736,7 +10736,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -11216,12 +11216,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD
@@ -11700,8 +11700,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -12165,8 +12165,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -12644,7 +12644,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -12652,7 +12652,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -13134,13 +13134,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -13614,13 +13614,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -14102,7 +14102,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -14115,7 +14115,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -14597,7 +14597,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -14610,7 +14610,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -15090,12 +15090,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD

mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result

@@ -74,8 +74,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -530,8 +530,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -994,7 +994,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -1002,7 +1002,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1463,13 +1463,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1926,13 +1926,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2395,7 +2395,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -2408,7 +2408,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2869,7 +2869,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -2882,7 +2882,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3341,12 +3341,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3804,8 +3804,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4298,8 +4298,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4800,7 +4800,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -4808,7 +4808,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5307,13 +5307,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5808,13 +5808,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6315,7 +6315,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -6328,7 +6328,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6827,7 +6827,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -6840,7 +6840,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7337,12 +7337,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7836,8 +7836,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8330,8 +8330,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8832,7 +8832,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -8840,7 +8840,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9339,13 +9339,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9840,13 +9840,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10347,7 +10347,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -10360,7 +10360,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10859,7 +10859,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -10872,7 +10872,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11369,12 +11369,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11869,8 +11869,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12377,8 +12377,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12893,7 +12893,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -12901,7 +12901,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13414,13 +13414,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13929,13 +13929,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14450,7 +14450,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -14463,7 +14463,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14976,7 +14976,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -14989,7 +14989,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15500,12 +15500,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16013,8 +16013,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16521,8 +16521,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17037,7 +17037,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -17045,7 +17045,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17558,13 +17558,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18073,13 +18073,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18594,7 +18594,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -18607,7 +18607,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19120,7 +19120,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -19133,7 +19133,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19644,12 +19644,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1

mysql-test/suite/parts/r/partition_alter2_1_2_innodb.result

@@ -70,8 +70,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -526,8 +526,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -990,7 +990,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -998,7 +998,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1459,13 +1459,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1922,13 +1922,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2389,7 +2389,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -2402,7 +2402,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2863,7 +2863,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -2876,7 +2876,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3335,12 +3335,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3798,8 +3798,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4293,8 +4293,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4796,7 +4796,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -4804,7 +4804,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5304,13 +5304,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5806,13 +5806,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6312,7 +6312,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -6325,7 +6325,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6825,7 +6825,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -6838,7 +6838,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7336,12 +7336,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7836,8 +7836,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8331,8 +8331,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8834,7 +8834,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -8842,7 +8842,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9342,13 +9342,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9844,13 +9844,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10350,7 +10350,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -10363,7 +10363,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10863,7 +10863,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -10876,7 +10876,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11374,12 +11374,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11875,8 +11875,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12383,8 +12383,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12899,7 +12899,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -12907,7 +12907,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13420,13 +13420,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13935,13 +13935,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14454,7 +14454,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -14467,7 +14467,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14980,7 +14980,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -14993,7 +14993,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15504,12 +15504,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16017,8 +16017,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16525,8 +16525,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17041,7 +17041,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -17049,7 +17049,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17562,13 +17562,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18077,13 +18077,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18596,7 +18596,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -18609,7 +18609,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19122,7 +19122,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -19135,7 +19135,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19646,12 +19646,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1

mysql-test/suite/parts/r/partition_alter2_1_maria.result

@@ -74,8 +74,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MAD
@@ -539,8 +539,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MAD
@@ -1018,7 +1018,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = Aria,
  PARTITION part_2 VALUES IN (-2) ENGINE = Aria,
  PARTITION part_1 VALUES IN (-1) ENGINE = Aria,
@@ -1026,7 +1026,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = Aria,
  PARTITION part1 VALUES IN (1) ENGINE = Aria,
  PARTITION part2 VALUES IN (2) ENGINE = Aria,
- PARTITION part3 VALUES IN (3) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (3) ENGINE = Aria)
 
 unified filelist
 t1#P#part0.MAD
@@ -1508,13 +1508,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
  PARTITION partd VALUES LESS THAN (15) ENGINE = Aria,
  PARTITION parte VALUES LESS THAN (20) ENGINE = Aria,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta.MAD
@@ -1988,13 +1988,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta#SP#partasp0.MAD
@@ -2478,7 +2478,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = Aria,
@@ -2491,7 +2491,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = Aria),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = Aria,
-  SUBPARTITION subpart42 ENGINE = Aria)) */
+  SUBPARTITION subpart42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#subpart11.MAD
@@ -2973,7 +2973,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = Aria,
@@ -2986,7 +2986,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = Aria),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = Aria,
-  SUBPARTITION sp42 ENGINE = Aria)) */
+  SUBPARTITION sp42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#sp11.MAD
@@ -3466,12 +3466,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = Aria,
  PARTITION part2 VALUES IN (1) ENGINE = Aria,
- PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = Aria)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MAD
@@ -3952,8 +3952,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MAD
@@ -4469,8 +4469,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MAD
@@ -5000,7 +5000,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = Aria,
  PARTITION part_2 VALUES IN (-2) ENGINE = Aria,
  PARTITION part_1 VALUES IN (-1) ENGINE = Aria,
@@ -5008,7 +5008,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = Aria,
  PARTITION part1 VALUES IN (1) ENGINE = Aria,
  PARTITION part2 VALUES IN (2) ENGINE = Aria,
- PARTITION part3 VALUES IN (3) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (3) ENGINE = Aria)
 
 unified filelist
 t1#P#part0.MAD
@@ -5542,13 +5542,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
  PARTITION partd VALUES LESS THAN (15) ENGINE = Aria,
  PARTITION parte VALUES LESS THAN (20) ENGINE = Aria,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta.MAD
@@ -6074,13 +6074,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta#SP#partasp0.MAD
@@ -6616,7 +6616,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = Aria,
@@ -6629,7 +6629,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = Aria),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = Aria,
-  SUBPARTITION subpart42 ENGINE = Aria)) */
+  SUBPARTITION subpart42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#subpart11.MAD
@@ -7163,7 +7163,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = Aria,
@@ -7176,7 +7176,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = Aria),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = Aria,
-  SUBPARTITION sp42 ENGINE = Aria)) */
+  SUBPARTITION sp42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#sp11.MAD
@@ -7708,12 +7708,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = Aria,
  PARTITION part2 VALUES IN (1) ENGINE = Aria,
- PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = Aria)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MAD
@@ -8244,8 +8244,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MAD
@@ -8761,8 +8761,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MAD
@@ -9292,7 +9292,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = Aria,
  PARTITION part_2 VALUES IN (-2) ENGINE = Aria,
  PARTITION part_1 VALUES IN (-1) ENGINE = Aria,
@@ -9300,7 +9300,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = Aria,
  PARTITION part1 VALUES IN (1) ENGINE = Aria,
  PARTITION part2 VALUES IN (2) ENGINE = Aria,
- PARTITION part3 VALUES IN (3) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (3) ENGINE = Aria)
 
 unified filelist
 t1#P#part0.MAD
@@ -9834,13 +9834,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
  PARTITION partd VALUES LESS THAN (15) ENGINE = Aria,
  PARTITION parte VALUES LESS THAN (20) ENGINE = Aria,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta.MAD
@@ -10366,13 +10366,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta#SP#partasp0.MAD
@@ -10908,7 +10908,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = Aria,
@@ -10921,7 +10921,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = Aria),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = Aria,
-  SUBPARTITION subpart42 ENGINE = Aria)) */
+  SUBPARTITION subpart42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#subpart11.MAD
@@ -11455,7 +11455,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = Aria,
@@ -11468,7 +11468,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = Aria),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = Aria,
-  SUBPARTITION sp42 ENGINE = Aria)) */
+  SUBPARTITION sp42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#sp11.MAD
@@ -12000,12 +12000,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = Aria,
  PARTITION part2 VALUES IN (1) ENGINE = Aria,
- PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = Aria)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MAD
@@ -12540,8 +12540,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MAD
@@ -13005,8 +13005,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MAD
@@ -13484,7 +13484,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = Aria,
  PARTITION part_2 VALUES IN (-2) ENGINE = Aria,
  PARTITION part_1 VALUES IN (-1) ENGINE = Aria,
@@ -13492,7 +13492,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = Aria,
  PARTITION part1 VALUES IN (1) ENGINE = Aria,
  PARTITION part2 VALUES IN (2) ENGINE = Aria,
- PARTITION part3 VALUES IN (3) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (3) ENGINE = Aria)
 
 unified filelist
 t1#P#part0.MAD
@@ -13974,13 +13974,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
  PARTITION partd VALUES LESS THAN (15) ENGINE = Aria,
  PARTITION parte VALUES LESS THAN (20) ENGINE = Aria,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta.MAD
@@ -14454,13 +14454,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta#SP#partasp0.MAD
@@ -14942,7 +14942,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = Aria,
@@ -14955,7 +14955,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = Aria),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = Aria,
-  SUBPARTITION subpart42 ENGINE = Aria)) */
+  SUBPARTITION subpart42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#subpart11.MAD
@@ -15437,7 +15437,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = Aria,
@@ -15450,7 +15450,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = Aria),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = Aria,
-  SUBPARTITION sp42 ENGINE = Aria)) */
+  SUBPARTITION sp42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#sp11.MAD
@@ -15930,12 +15930,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = Aria,
  PARTITION part2 VALUES IN (1) ENGINE = Aria,
- PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = Aria)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MAD
@@ -16416,8 +16416,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MAD
@@ -16933,8 +16933,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MAD
@@ -17464,7 +17464,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = Aria,
  PARTITION part_2 VALUES IN (-2) ENGINE = Aria,
  PARTITION part_1 VALUES IN (-1) ENGINE = Aria,
@@ -17472,7 +17472,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = Aria,
  PARTITION part1 VALUES IN (1) ENGINE = Aria,
  PARTITION part2 VALUES IN (2) ENGINE = Aria,
- PARTITION part3 VALUES IN (3) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (3) ENGINE = Aria)
 
 unified filelist
 t1#P#part0.MAD
@@ -18006,13 +18006,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
  PARTITION partd VALUES LESS THAN (15) ENGINE = Aria,
  PARTITION parte VALUES LESS THAN (20) ENGINE = Aria,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta.MAD
@@ -18538,13 +18538,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta#SP#partasp0.MAD
@@ -19078,7 +19078,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = Aria,
@@ -19091,7 +19091,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = Aria),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = Aria,
-  SUBPARTITION subpart42 ENGINE = Aria)) */
+  SUBPARTITION subpart42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#subpart11.MAD
@@ -19625,7 +19625,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = Aria,
@@ -19638,7 +19638,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = Aria),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = Aria,
-  SUBPARTITION sp42 ENGINE = Aria)) */
+  SUBPARTITION sp42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#sp11.MAD
@@ -20170,12 +20170,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = Aria,
  PARTITION part2 VALUES IN (1) ENGINE = Aria,
- PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = Aria)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MAD
@@ -20706,8 +20706,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MAD
@@ -21223,8 +21223,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MAD
@@ -21754,7 +21754,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = Aria,
  PARTITION part_2 VALUES IN (-2) ENGINE = Aria,
  PARTITION part_1 VALUES IN (-1) ENGINE = Aria,
@@ -21762,7 +21762,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = Aria,
  PARTITION part1 VALUES IN (1) ENGINE = Aria,
  PARTITION part2 VALUES IN (2) ENGINE = Aria,
- PARTITION part3 VALUES IN (3) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (3) ENGINE = Aria)
 
 unified filelist
 t1#P#part0.MAD
@@ -22296,13 +22296,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
  PARTITION partd VALUES LESS THAN (15) ENGINE = Aria,
  PARTITION parte VALUES LESS THAN (20) ENGINE = Aria,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta.MAD
@@ -22828,13 +22828,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta#SP#partasp0.MAD
@@ -23368,7 +23368,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = Aria,
@@ -23381,7 +23381,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = Aria),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = Aria,
-  SUBPARTITION subpart42 ENGINE = Aria)) */
+  SUBPARTITION subpart42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#subpart11.MAD
@@ -23915,7 +23915,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = Aria,
@@ -23928,7 +23928,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = Aria),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = Aria,
-  SUBPARTITION sp42 ENGINE = Aria)) */
+  SUBPARTITION sp42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#sp11.MAD
@@ -24460,12 +24460,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = Aria,
  PARTITION part2 VALUES IN (1) ENGINE = Aria,
- PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = Aria)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MAD

mysql-test/suite/parts/r/partition_alter2_1_myisam.result

@@ -74,8 +74,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -539,8 +539,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -1018,7 +1018,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -1026,7 +1026,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -1508,13 +1508,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -1988,13 +1988,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -2478,7 +2478,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -2491,7 +2491,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -2973,7 +2973,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -2986,7 +2986,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -3466,12 +3466,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD
@@ -3952,8 +3952,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -4469,8 +4469,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -5000,7 +5000,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -5008,7 +5008,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -5542,13 +5542,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -6074,13 +6074,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -6616,7 +6616,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -6629,7 +6629,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -7163,7 +7163,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -7176,7 +7176,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -7708,12 +7708,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD
@@ -8244,8 +8244,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -8761,8 +8761,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -9292,7 +9292,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -9300,7 +9300,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -9834,13 +9834,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -10366,13 +10366,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -10908,7 +10908,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -10921,7 +10921,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -11455,7 +11455,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -11468,7 +11468,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -12000,12 +12000,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD
@@ -12540,8 +12540,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -13005,8 +13005,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -13484,7 +13484,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -13492,7 +13492,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -13974,13 +13974,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -14454,13 +14454,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -14942,7 +14942,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -14955,7 +14955,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -15437,7 +15437,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -15450,7 +15450,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -15930,12 +15930,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD
@@ -16416,8 +16416,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -16933,8 +16933,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -17464,7 +17464,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -17472,7 +17472,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -18006,13 +18006,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -18538,13 +18538,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -19078,7 +19078,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -19091,7 +19091,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -19625,7 +19625,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -19638,7 +19638,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -20170,12 +20170,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD
@@ -20706,8 +20706,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -21223,8 +21223,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -21754,7 +21754,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -21762,7 +21762,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -22296,13 +22296,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -22828,13 +22828,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -23368,7 +23368,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -23381,7 +23381,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -23915,7 +23915,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -23928,7 +23928,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -24460,12 +24460,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD

mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result

@@ -74,8 +74,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -532,8 +532,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -998,7 +998,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -1006,7 +1006,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1469,13 +1469,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1932,13 +1932,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2403,7 +2403,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -2416,7 +2416,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2877,7 +2877,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -2890,7 +2890,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3351,12 +3351,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3815,8 +3815,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4311,8 +4311,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4815,7 +4815,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -4823,7 +4823,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5324,13 +5324,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5825,13 +5825,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6334,7 +6334,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -6347,7 +6347,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6846,7 +6846,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -6859,7 +6859,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7358,12 +7358,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7859,8 +7859,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8355,8 +8355,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8859,7 +8859,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -8867,7 +8867,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9368,13 +9368,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9869,13 +9869,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10378,7 +10378,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -10391,7 +10391,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10890,7 +10890,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -10903,7 +10903,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11402,12 +11402,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11904,8 +11904,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12414,8 +12414,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12932,7 +12932,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -12940,7 +12940,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13455,13 +13455,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13970,13 +13970,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14493,7 +14493,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -14506,7 +14506,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15019,7 +15019,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -15032,7 +15032,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15545,12 +15545,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16060,8 +16060,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16570,8 +16570,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17088,7 +17088,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -17096,7 +17096,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17611,13 +17611,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18126,13 +18126,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18649,7 +18649,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -18662,7 +18662,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19175,7 +19175,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -19188,7 +19188,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19701,12 +19701,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1

mysql-test/suite/parts/r/partition_alter2_2_2_innodb.result

@@ -69,8 +69,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -528,8 +528,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -995,7 +995,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -1003,7 +1003,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1467,13 +1467,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1935,13 +1935,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2407,7 +2407,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -2420,7 +2420,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2886,7 +2886,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -2899,7 +2899,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3361,12 +3361,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3827,8 +3827,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4325,8 +4325,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4831,7 +4831,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -4839,7 +4839,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5342,13 +5342,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5849,13 +5849,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6360,7 +6360,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -6373,7 +6373,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6878,7 +6878,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -6891,7 +6891,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7392,12 +7392,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7895,8 +7895,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8393,8 +8393,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8899,7 +8899,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -8907,7 +8907,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9410,13 +9410,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9917,13 +9917,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10428,7 +10428,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -10441,7 +10441,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10946,7 +10946,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -10959,7 +10959,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11460,12 +11460,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11964,8 +11964,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12475,8 +12475,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12994,7 +12994,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -13002,7 +13002,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13518,13 +13518,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14038,13 +14038,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14562,7 +14562,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -14575,7 +14575,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15093,7 +15093,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -15106,7 +15106,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15620,12 +15620,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16136,8 +16136,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16647,8 +16647,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17166,7 +17166,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -17174,7 +17174,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17690,13 +17690,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18210,13 +18210,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18734,7 +18734,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -18747,7 +18747,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19265,7 +19265,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -19278,7 +19278,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19792,12 +19792,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1

mysql-test/suite/parts/r/partition_alter2_2_maria.result

@@ -74,8 +74,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MAD
@@ -541,8 +541,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MAD
@@ -1022,7 +1022,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = Aria,
  PARTITION part_2 VALUES IN (-2) ENGINE = Aria,
  PARTITION part_1 VALUES IN (-1) ENGINE = Aria,
@@ -1030,7 +1030,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = Aria,
  PARTITION part1 VALUES IN (1) ENGINE = Aria,
  PARTITION part2 VALUES IN (2) ENGINE = Aria,
- PARTITION part3 VALUES IN (3) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (3) ENGINE = Aria)
 
 unified filelist
 t1#P#part0.MAD
@@ -1514,13 +1514,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
  PARTITION partd VALUES LESS THAN (15) ENGINE = Aria,
  PARTITION parte VALUES LESS THAN (20) ENGINE = Aria,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta.MAD
@@ -1994,13 +1994,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta#SP#partasp0.MAD
@@ -2486,7 +2486,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = Aria,
@@ -2499,7 +2499,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = Aria),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = Aria,
-  SUBPARTITION subpart42 ENGINE = Aria)) */
+  SUBPARTITION subpart42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#subpart11.MAD
@@ -2981,7 +2981,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = Aria,
@@ -2994,7 +2994,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = Aria),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = Aria,
-  SUBPARTITION sp42 ENGINE = Aria)) */
+  SUBPARTITION sp42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#sp11.MAD
@@ -3476,12 +3476,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = Aria,
  PARTITION part2 VALUES IN (1) ENGINE = Aria,
- PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = Aria)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MAD
@@ -3964,8 +3964,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MAD
@@ -4483,8 +4483,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MAD
@@ -5016,7 +5016,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = Aria,
  PARTITION part_2 VALUES IN (-2) ENGINE = Aria,
  PARTITION part_1 VALUES IN (-1) ENGINE = Aria,
@@ -5024,7 +5024,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = Aria,
  PARTITION part1 VALUES IN (1) ENGINE = Aria,
  PARTITION part2 VALUES IN (2) ENGINE = Aria,
- PARTITION part3 VALUES IN (3) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (3) ENGINE = Aria)
 
 unified filelist
 t1#P#part0.MAD
@@ -5560,13 +5560,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
  PARTITION partd VALUES LESS THAN (15) ENGINE = Aria,
  PARTITION parte VALUES LESS THAN (20) ENGINE = Aria,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta.MAD
@@ -6092,13 +6092,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta#SP#partasp0.MAD
@@ -6636,7 +6636,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = Aria,
@@ -6649,7 +6649,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = Aria),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = Aria,
-  SUBPARTITION subpart42 ENGINE = Aria)) */
+  SUBPARTITION subpart42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#subpart11.MAD
@@ -7183,7 +7183,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = Aria,
@@ -7196,7 +7196,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = Aria),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = Aria,
-  SUBPARTITION sp42 ENGINE = Aria)) */
+  SUBPARTITION sp42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#sp11.MAD
@@ -7730,12 +7730,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = Aria,
  PARTITION part2 VALUES IN (1) ENGINE = Aria,
- PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = Aria)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MAD
@@ -8268,8 +8268,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MAD
@@ -8787,8 +8787,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MAD
@@ -9320,7 +9320,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = Aria,
  PARTITION part_2 VALUES IN (-2) ENGINE = Aria,
  PARTITION part_1 VALUES IN (-1) ENGINE = Aria,
@@ -9328,7 +9328,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = Aria,
  PARTITION part1 VALUES IN (1) ENGINE = Aria,
  PARTITION part2 VALUES IN (2) ENGINE = Aria,
- PARTITION part3 VALUES IN (3) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (3) ENGINE = Aria)
 
 unified filelist
 t1#P#part0.MAD
@@ -9864,13 +9864,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
  PARTITION partd VALUES LESS THAN (15) ENGINE = Aria,
  PARTITION parte VALUES LESS THAN (20) ENGINE = Aria,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta.MAD
@@ -10396,13 +10396,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta#SP#partasp0.MAD
@@ -10940,7 +10940,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = Aria,
@@ -10953,7 +10953,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = Aria),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = Aria,
-  SUBPARTITION subpart42 ENGINE = Aria)) */
+  SUBPARTITION subpart42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#subpart11.MAD
@@ -11487,7 +11487,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = Aria,
@@ -11500,7 +11500,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = Aria),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = Aria,
-  SUBPARTITION sp42 ENGINE = Aria)) */
+  SUBPARTITION sp42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#sp11.MAD
@@ -12034,12 +12034,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = Aria,
  PARTITION part2 VALUES IN (1) ENGINE = Aria,
- PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = Aria)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MAD
@@ -12575,8 +12575,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MAD
@@ -13043,8 +13043,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MAD
@@ -13525,7 +13525,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = Aria,
  PARTITION part_2 VALUES IN (-2) ENGINE = Aria,
  PARTITION part_1 VALUES IN (-1) ENGINE = Aria,
@@ -13533,7 +13533,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = Aria,
  PARTITION part1 VALUES IN (1) ENGINE = Aria,
  PARTITION part2 VALUES IN (2) ENGINE = Aria,
- PARTITION part3 VALUES IN (3) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (3) ENGINE = Aria)
 
 unified filelist
 t1#P#part0.MAD
@@ -14018,13 +14018,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
  PARTITION partd VALUES LESS THAN (15) ENGINE = Aria,
  PARTITION parte VALUES LESS THAN (20) ENGINE = Aria,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta.MAD
@@ -14503,13 +14503,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta#SP#partasp0.MAD
@@ -14996,7 +14996,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = Aria,
@@ -15009,7 +15009,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = Aria),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = Aria,
-  SUBPARTITION subpart42 ENGINE = Aria)) */
+  SUBPARTITION subpart42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#subpart11.MAD
@@ -15496,7 +15496,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = Aria,
@@ -15509,7 +15509,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = Aria),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = Aria,
-  SUBPARTITION sp42 ENGINE = Aria)) */
+  SUBPARTITION sp42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#sp11.MAD
@@ -15992,12 +15992,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = Aria,
  PARTITION part2 VALUES IN (1) ENGINE = Aria,
- PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = Aria)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MAD
@@ -16481,8 +16481,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MAD
@@ -17001,8 +17001,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MAD
@@ -17535,7 +17535,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = Aria,
  PARTITION part_2 VALUES IN (-2) ENGINE = Aria,
  PARTITION part_1 VALUES IN (-1) ENGINE = Aria,
@@ -17543,7 +17543,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = Aria,
  PARTITION part1 VALUES IN (1) ENGINE = Aria,
  PARTITION part2 VALUES IN (2) ENGINE = Aria,
- PARTITION part3 VALUES IN (3) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (3) ENGINE = Aria)
 
 unified filelist
 t1#P#part0.MAD
@@ -18080,13 +18080,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
  PARTITION partd VALUES LESS THAN (15) ENGINE = Aria,
  PARTITION parte VALUES LESS THAN (20) ENGINE = Aria,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta.MAD
@@ -18617,13 +18617,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta#SP#partasp0.MAD
@@ -19162,7 +19162,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = Aria,
@@ -19175,7 +19175,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = Aria),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = Aria,
-  SUBPARTITION subpart42 ENGINE = Aria)) */
+  SUBPARTITION subpart42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#subpart11.MAD
@@ -19714,7 +19714,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = Aria,
@@ -19727,7 +19727,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = Aria),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = Aria,
-  SUBPARTITION sp42 ENGINE = Aria)) */
+  SUBPARTITION sp42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#sp11.MAD
@@ -20262,12 +20262,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = Aria,
  PARTITION part2 VALUES IN (1) ENGINE = Aria,
- PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = Aria)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MAD
@@ -20801,8 +20801,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MAD
@@ -21321,8 +21321,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MAD
@@ -21855,7 +21855,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = Aria,
  PARTITION part_2 VALUES IN (-2) ENGINE = Aria,
  PARTITION part_1 VALUES IN (-1) ENGINE = Aria,
@@ -21863,7 +21863,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = Aria,
  PARTITION part1 VALUES IN (1) ENGINE = Aria,
  PARTITION part2 VALUES IN (2) ENGINE = Aria,
- PARTITION part3 VALUES IN (3) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (3) ENGINE = Aria)
 
 unified filelist
 t1#P#part0.MAD
@@ -22400,13 +22400,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
  PARTITION partd VALUES LESS THAN (15) ENGINE = Aria,
  PARTITION parte VALUES LESS THAN (20) ENGINE = Aria,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta.MAD
@@ -22937,13 +22937,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = Aria,
  PARTITION partb VALUES LESS THAN (5) ENGINE = Aria,
  PARTITION partc VALUES LESS THAN (10) ENGINE = Aria,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = Aria)
 
 unified filelist
 t1#P#parta#SP#partasp0.MAD
@@ -23482,7 +23482,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = Aria,
@@ -23495,7 +23495,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = Aria),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = Aria,
-  SUBPARTITION subpart42 ENGINE = Aria)) */
+  SUBPARTITION subpart42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#subpart11.MAD
@@ -24034,7 +24034,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = Aria,
@@ -24047,7 +24047,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = Aria),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = Aria,
-  SUBPARTITION sp42 ENGINE = Aria)) */
+  SUBPARTITION sp42 ENGINE = Aria))
 
 unified filelist
 t1#P#part1#SP#sp11.MAD
@@ -24582,12 +24582,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = Aria,
  PARTITION part2 VALUES IN (1) ENGINE = Aria,
- PARTITION part3 VALUES IN (NULL) ENGINE = Aria) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = Aria)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MAD

mysql-test/suite/parts/r/partition_alter2_2_myisam.result

@@ -74,8 +74,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -541,8 +541,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -1022,7 +1022,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -1030,7 +1030,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -1514,13 +1514,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -1994,13 +1994,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -2486,7 +2486,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -2499,7 +2499,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -2981,7 +2981,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -2994,7 +2994,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -3476,12 +3476,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD
@@ -3964,8 +3964,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -4483,8 +4483,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -5016,7 +5016,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -5024,7 +5024,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -5560,13 +5560,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -6092,13 +6092,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -6636,7 +6636,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -6649,7 +6649,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -7183,7 +7183,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -7196,7 +7196,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -7730,12 +7730,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD
@@ -8268,8 +8268,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -8787,8 +8787,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -9320,7 +9320,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -9328,7 +9328,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -9864,13 +9864,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -10396,13 +10396,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -10940,7 +10940,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -10953,7 +10953,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -11487,7 +11487,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -11500,7 +11500,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -12034,12 +12034,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD
@@ -12575,8 +12575,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -13043,8 +13043,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -13525,7 +13525,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -13533,7 +13533,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -14018,13 +14018,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -14503,13 +14503,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -14996,7 +14996,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -15009,7 +15009,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -15496,7 +15496,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -15509,7 +15509,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -15992,12 +15992,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD
@@ -16481,8 +16481,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -17001,8 +17001,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -17535,7 +17535,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -17543,7 +17543,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -18080,13 +18080,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -18617,13 +18617,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -19162,7 +19162,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -19175,7 +19175,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -19714,7 +19714,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -19727,7 +19727,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -20262,12 +20262,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD
@@ -20801,8 +20801,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -21321,8 +21321,8 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -21855,7 +21855,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -21863,7 +21863,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -22400,13 +22400,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -22937,13 +22937,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -23482,7 +23482,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -23495,7 +23495,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -24034,7 +24034,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -24047,7 +24047,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -24582,12 +24582,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD

mysql-test/suite/parts/r/partition_alter3_innodb.result

@@ -78,7 +78,7 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date)) */
+ PARTITION BY HASH (YEAR(f_date))
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -97,7 +97,7 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAYOFYEAR(f_date)) */
+ PARTITION BY HASH (DAYOFYEAR(f_date))
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -114,7 +114,7 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date)) */
+ PARTITION BY HASH (YEAR(f_date))
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -137,10 +137,10 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date))
+ PARTITION BY HASH (YEAR(f_date))
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
- PARTITION part7 ENGINE = InnoDB) */
+ PARTITION part7 ENGINE = InnoDB)
 t1#P#p0.ibd
 t1#P#part1.ibd
 t1#P#part7.ibd
@@ -163,11 +163,11 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date))
+ PARTITION BY HASH (YEAR(f_date))
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
  PARTITION part7 ENGINE = InnoDB,
- PARTITION part2 ENGINE = InnoDB) */
+ PARTITION part2 ENGINE = InnoDB)
 t1#P#p0.ibd
 t1#P#part1.ibd
 t1#P#part2.ibd
@@ -188,7 +188,7 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date))
+ PARTITION BY HASH (YEAR(f_date))
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
  PARTITION part7 ENGINE = InnoDB,
@@ -196,7 +196,7 @@ t1	CREATE TABLE `t1` (
  PARTITION p4 ENGINE = InnoDB,
  PARTITION p5 ENGINE = InnoDB,
  PARTITION p6 ENGINE = InnoDB,
- PARTITION p7 ENGINE = InnoDB) */
+ PARTITION p7 ENGINE = InnoDB)
 t1#P#p0.ibd
 t1#P#p4.ibd
 t1#P#p5.ibd
@@ -233,14 +233,14 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date))
+ PARTITION BY HASH (YEAR(f_date))
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
  PARTITION part7 ENGINE = InnoDB,
  PARTITION part2 ENGINE = InnoDB,
  PARTITION p4 ENGINE = InnoDB,
  PARTITION p5 ENGINE = InnoDB,
- PARTITION p6 ENGINE = InnoDB) */
+ PARTITION p6 ENGINE = InnoDB)
 t1#P#p0.ibd
 t1#P#p4.ibd
 t1#P#p5.ibd
@@ -263,13 +263,13 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date))
+ PARTITION BY HASH (YEAR(f_date))
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
  PARTITION part7 ENGINE = InnoDB,
  PARTITION part2 ENGINE = InnoDB,
  PARTITION p4 ENGINE = InnoDB,
- PARTITION p5 ENGINE = InnoDB) */
+ PARTITION p5 ENGINE = InnoDB)
 t1#P#p0.ibd
 t1#P#p4.ibd
 t1#P#p5.ibd
@@ -291,12 +291,12 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date))
+ PARTITION BY HASH (YEAR(f_date))
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
  PARTITION part7 ENGINE = InnoDB,
  PARTITION part2 ENGINE = InnoDB,
- PARTITION p4 ENGINE = InnoDB) */
+ PARTITION p4 ENGINE = InnoDB)
 t1#P#p0.ibd
 t1#P#p4.ibd
 t1#P#part1.ibd
@@ -317,11 +317,11 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date))
+ PARTITION BY HASH (YEAR(f_date))
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
  PARTITION part7 ENGINE = InnoDB,
- PARTITION part2 ENGINE = InnoDB) */
+ PARTITION part2 ENGINE = InnoDB)
 t1#P#p0.ibd
 t1#P#part1.ibd
 t1#P#part2.ibd
@@ -341,10 +341,10 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date))
+ PARTITION BY HASH (YEAR(f_date))
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
- PARTITION part7 ENGINE = InnoDB) */
+ PARTITION part7 ENGINE = InnoDB)
 t1#P#p0.ibd
 t1#P#part1.ibd
 t1#P#part7.ibd
@@ -363,9 +363,9 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date))
+ PARTITION BY HASH (YEAR(f_date))
 (PARTITION p0 ENGINE = InnoDB,
- PARTITION part1 ENGINE = InnoDB) */
+ PARTITION part1 ENGINE = InnoDB)
 t1#P#p0.ibd
 t1#P#part1.ibd
 t1.frm
@@ -383,8 +383,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date))
+ PARTITION BY HASH (YEAR(f_date))
-(PARTITION p0 ENGINE = InnoDB) */
+(PARTITION p0 ENGINE = InnoDB)
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -469,7 +469,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1) */
+ PARTITION BY KEY (f_int1)
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -495,10 +495,10 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
- PARTITION part7 ENGINE = InnoDB) */
+ PARTITION part7 ENGINE = InnoDB)
 t1#P#p0.ibd
 t1#P#part1.ibd
 t1#P#part7.ibd
@@ -521,11 +521,11 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
  PARTITION part7 ENGINE = InnoDB,
- PARTITION part2 ENGINE = InnoDB) */
+ PARTITION part2 ENGINE = InnoDB)
 t1#P#p0.ibd
 t1#P#part1.ibd
 t1#P#part2.ibd
@@ -549,7 +549,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
  PARTITION part7 ENGINE = InnoDB,
@@ -557,7 +557,7 @@ t1	CREATE TABLE `t1` (
  PARTITION p4 ENGINE = InnoDB,
  PARTITION p5 ENGINE = InnoDB,
  PARTITION p6 ENGINE = InnoDB,
- PARTITION p7 ENGINE = InnoDB) */
+ PARTITION p7 ENGINE = InnoDB)
 t1#P#p0.ibd
 t1#P#p4.ibd
 t1#P#p5.ibd
@@ -592,14 +592,14 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
  PARTITION part7 ENGINE = InnoDB,
  PARTITION part2 ENGINE = InnoDB,
  PARTITION p4 ENGINE = InnoDB,
  PARTITION p5 ENGINE = InnoDB,
- PARTITION p6 ENGINE = InnoDB) */
+ PARTITION p6 ENGINE = InnoDB)
 t1#P#p0.ibd
 t1#P#p4.ibd
 t1#P#p5.ibd
@@ -625,13 +625,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
  PARTITION part7 ENGINE = InnoDB,
  PARTITION part2 ENGINE = InnoDB,
  PARTITION p4 ENGINE = InnoDB,
- PARTITION p5 ENGINE = InnoDB) */
+ PARTITION p5 ENGINE = InnoDB)
 t1#P#p0.ibd
 t1#P#p4.ibd
 t1#P#p5.ibd
@@ -656,12 +656,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
  PARTITION part7 ENGINE = InnoDB,
  PARTITION part2 ENGINE = InnoDB,
- PARTITION p4 ENGINE = InnoDB) */
+ PARTITION p4 ENGINE = InnoDB)
 t1#P#p0.ibd
 t1#P#p4.ibd
 t1#P#part1.ibd
@@ -685,11 +685,11 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
  PARTITION part7 ENGINE = InnoDB,
- PARTITION part2 ENGINE = InnoDB) */
+ PARTITION part2 ENGINE = InnoDB)
 t1#P#p0.ibd
 t1#P#part1.ibd
 t1#P#part2.ibd
@@ -712,10 +712,10 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
- PARTITION part7 ENGINE = InnoDB) */
+ PARTITION part7 ENGINE = InnoDB)
 t1#P#p0.ibd
 t1#P#part1.ibd
 t1#P#part7.ibd
@@ -737,9 +737,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = InnoDB,
- PARTITION part1 ENGINE = InnoDB) */
+ PARTITION part1 ENGINE = InnoDB)
 t1#P#p0.ibd
 t1#P#part1.ibd
 t1.frm
@@ -760,8 +760,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-(PARTITION p0 ENGINE = InnoDB) */
+(PARTITION p0 ENGINE = InnoDB)
 t1#P#p0.ibd
 t1.frm
 t1.par

mysql-test/suite/parts/r/partition_alter3_myisam.result

@@ -79,7 +79,7 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date)) */
+ PARTITION BY HASH (YEAR(f_date))
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -99,7 +99,7 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (DAYOFYEAR(f_date)) */
+ PARTITION BY HASH (DAYOFYEAR(f_date))
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -117,7 +117,7 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date)) */
+ PARTITION BY HASH (YEAR(f_date))
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -141,10 +141,10 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date))
+ PARTITION BY HASH (YEAR(f_date))
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
- PARTITION part7 ENGINE = MyISAM) */
+ PARTITION part7 ENGINE = MyISAM)
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#part1.MYD
@@ -170,11 +170,11 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date))
+ PARTITION BY HASH (YEAR(f_date))
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
  PARTITION part7 ENGINE = MyISAM,
- PARTITION part2 ENGINE = MyISAM) */
+ PARTITION part2 ENGINE = MyISAM)
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#part1.MYD
@@ -199,7 +199,7 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date))
+ PARTITION BY HASH (YEAR(f_date))
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
  PARTITION part7 ENGINE = MyISAM,
@@ -207,7 +207,7 @@ t1	CREATE TABLE `t1` (
  PARTITION p4 ENGINE = MyISAM,
  PARTITION p5 ENGINE = MyISAM,
  PARTITION p6 ENGINE = MyISAM,
- PARTITION p7 ENGINE = MyISAM) */
+ PARTITION p7 ENGINE = MyISAM)
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p4.MYD
@@ -252,14 +252,14 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date))
+ PARTITION BY HASH (YEAR(f_date))
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
  PARTITION part7 ENGINE = MyISAM,
  PARTITION part2 ENGINE = MyISAM,
  PARTITION p4 ENGINE = MyISAM,
  PARTITION p5 ENGINE = MyISAM,
- PARTITION p6 ENGINE = MyISAM) */
+ PARTITION p6 ENGINE = MyISAM)
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p4.MYD
@@ -289,13 +289,13 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date))
+ PARTITION BY HASH (YEAR(f_date))
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
  PARTITION part7 ENGINE = MyISAM,
  PARTITION part2 ENGINE = MyISAM,
  PARTITION p4 ENGINE = MyISAM,
- PARTITION p5 ENGINE = MyISAM) */
+ PARTITION p5 ENGINE = MyISAM)
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p4.MYD
@@ -323,12 +323,12 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date))
+ PARTITION BY HASH (YEAR(f_date))
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
  PARTITION part7 ENGINE = MyISAM,
  PARTITION part2 ENGINE = MyISAM,
- PARTITION p4 ENGINE = MyISAM) */
+ PARTITION p4 ENGINE = MyISAM)
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p4.MYD
@@ -354,11 +354,11 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date))
+ PARTITION BY HASH (YEAR(f_date))
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
  PARTITION part7 ENGINE = MyISAM,
- PARTITION part2 ENGINE = MyISAM) */
+ PARTITION part2 ENGINE = MyISAM)
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#part1.MYD
@@ -382,10 +382,10 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date))
+ PARTITION BY HASH (YEAR(f_date))
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
- PARTITION part7 ENGINE = MyISAM) */
+ PARTITION part7 ENGINE = MyISAM)
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#part1.MYD
@@ -407,9 +407,9 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date))
+ PARTITION BY HASH (YEAR(f_date))
 (PARTITION p0 ENGINE = MyISAM,
- PARTITION part1 ENGINE = MyISAM) */
+ PARTITION part1 ENGINE = MyISAM)
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#part1.MYD
@@ -429,8 +429,8 @@ t1	CREATE TABLE `t1` (
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (YEAR(f_date))
+ PARTITION BY HASH (YEAR(f_date))
-(PARTITION p0 ENGINE = MyISAM) */
+(PARTITION p0 ENGINE = MyISAM)
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -512,7 +512,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1) */
+ PARTITION BY KEY (f_int1)
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -539,10 +539,10 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
- PARTITION part7 ENGINE = MyISAM) */
+ PARTITION part7 ENGINE = MyISAM)
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#part1.MYD
@@ -568,11 +568,11 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
  PARTITION part7 ENGINE = MyISAM,
- PARTITION part2 ENGINE = MyISAM) */
+ PARTITION part2 ENGINE = MyISAM)
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#part1.MYD
@@ -600,7 +600,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
  PARTITION part7 ENGINE = MyISAM,
@@ -608,7 +608,7 @@ t1	CREATE TABLE `t1` (
  PARTITION p4 ENGINE = MyISAM,
  PARTITION p5 ENGINE = MyISAM,
  PARTITION p6 ENGINE = MyISAM,
- PARTITION p7 ENGINE = MyISAM) */
+ PARTITION p7 ENGINE = MyISAM)
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p4.MYD
@@ -651,14 +651,14 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
  PARTITION part7 ENGINE = MyISAM,
  PARTITION part2 ENGINE = MyISAM,
  PARTITION p4 ENGINE = MyISAM,
  PARTITION p5 ENGINE = MyISAM,
- PARTITION p6 ENGINE = MyISAM) */
+ PARTITION p6 ENGINE = MyISAM)
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p4.MYD
@@ -691,13 +691,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
  PARTITION part7 ENGINE = MyISAM,
  PARTITION part2 ENGINE = MyISAM,
  PARTITION p4 ENGINE = MyISAM,
- PARTITION p5 ENGINE = MyISAM) */
+ PARTITION p5 ENGINE = MyISAM)
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p4.MYD
@@ -728,12 +728,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
  PARTITION part7 ENGINE = MyISAM,
  PARTITION part2 ENGINE = MyISAM,
- PARTITION p4 ENGINE = MyISAM) */
+ PARTITION p4 ENGINE = MyISAM)
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p4.MYD
@@ -762,11 +762,11 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
  PARTITION part7 ENGINE = MyISAM,
- PARTITION part2 ENGINE = MyISAM) */
+ PARTITION part2 ENGINE = MyISAM)
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#part1.MYD
@@ -793,10 +793,10 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
- PARTITION part7 ENGINE = MyISAM) */
+ PARTITION part7 ENGINE = MyISAM)
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#part1.MYD
@@ -821,9 +821,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = MyISAM,
- PARTITION part1 ENGINE = MyISAM) */
+ PARTITION part1 ENGINE = MyISAM)
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#part1.MYD
@@ -846,8 +846,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-(PARTITION p0 ENGINE = MyISAM) */
+(PARTITION p0 ENGINE = MyISAM)
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm

mysql-test/suite/parts/r/partition_auto_increment_archive.result

@@ -135,8 +135,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=ARCHIVE AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1;
 c1
 1
@@ -341,8 +341,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=ARCHIVE AUTO_INCREMENT=27 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 2
@@ -365,8 +365,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=ARCHIVE AUTO_INCREMENT=28 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 2
@@ -394,8 +394,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 # Test with two threads
 connection default;
@@ -646,8 +646,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=ARCHIVE AUTO_INCREMENT=15 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (4);
 # ERROR (only OK if Archive) mysql_errno: 1022
 SHOW CREATE TABLE t1;
@@ -656,8 +656,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=ARCHIVE AUTO_INCREMENT=15 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (0);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -665,8 +665,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=ARCHIVE AUTO_INCREMENT=16 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -674,8 +674,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=ARCHIVE AUTO_INCREMENT=17 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 15
@@ -689,8 +689,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=ARCHIVE AUTO_INCREMENT=301 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (0);
 # ERROR (only OK if Archive) mysql_errno: 1022
 SHOW CREATE TABLE t1;
@@ -699,8 +699,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=ARCHIVE AUTO_INCREMENT=301 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -708,8 +708,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=ARCHIVE AUTO_INCREMENT=302 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 15
@@ -729,8 +729,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -738,8 +738,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=ARCHIVE AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1;
 c1
 1
@@ -750,8 +750,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=ARCHIVE AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -759,8 +759,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=ARCHIVE AUTO_INCREMENT=24 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SET INSERT_ID = 22;
 INSERT INTO t1 VALUES (NULL), (NULL), (NULL);
 INSERT INTO t1 VALUES (NULL);
@@ -784,8 +784,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 FLUSH TABLE;
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -793,8 +793,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 VALUES (4);
 FLUSH TABLE;
 SHOW CREATE TABLE t1;
@@ -803,8 +803,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=ARCHIVE AUTO_INCREMENT=5 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 VALUES (NULL);
 FLUSH TABLE;
 SHOW CREATE TABLE t1;
@@ -813,8 +813,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=ARCHIVE AUTO_INCREMENT=6 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 4

mysql-test/suite/parts/r/partition_auto_increment_blackhole.result

@@ -166,8 +166,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=BLACKHOLE AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1;
 c1
 DROP TABLE t1;
@@ -324,8 +324,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=BLACKHOLE AUTO_INCREMENT=27 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 TRUNCATE TABLE t1;
@@ -336,8 +336,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=BLACKHOLE AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 INSERT INTO t1 VALUES (100);
@@ -352,8 +352,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=BLACKHOLE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 # Test with two threads
 connection default;
@@ -534,8 +534,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=BLACKHOLE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (4);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -543,8 +543,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=BLACKHOLE AUTO_INCREMENT=5 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (0);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -552,8 +552,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=BLACKHOLE AUTO_INCREMENT=6 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -561,8 +561,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=BLACKHOLE AUTO_INCREMENT=7 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 # Test sql_mode 'NO_AUTO_VALUE_ON_ZERO'
@@ -574,8 +574,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=BLACKHOLE AUTO_INCREMENT=301 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (0);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -583,8 +583,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=BLACKHOLE AUTO_INCREMENT=301 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -592,8 +592,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=BLACKHOLE AUTO_INCREMENT=302 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 SET @@session.sql_mode = '';
@@ -609,8 +609,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=BLACKHOLE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -618,8 +618,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=BLACKHOLE AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1;
 c1
 SET INSERT_ID = 23;
@@ -629,8 +629,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=BLACKHOLE AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -638,8 +638,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=BLACKHOLE AUTO_INCREMENT=24 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SET INSERT_ID = 22;
 INSERT INTO t1 VALUES (NULL), (NULL), (NULL);
 # ERROR (only OK if Blackhole) should give ER_DUP_KEY or ER_DUP_ENTRY
@@ -661,8 +661,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=BLACKHOLE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 FLUSH TABLE;
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -670,8 +670,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=BLACKHOLE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 VALUES (4);
 FLUSH TABLE;
 SHOW CREATE TABLE t1;
@@ -680,8 +680,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=BLACKHOLE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 VALUES (NULL);
 FLUSH TABLE;
 SHOW CREATE TABLE t1;
@@ -690,8 +690,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=BLACKHOLE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 DROP TABLE t1;

mysql-test/suite/parts/r/partition_auto_increment_innodb.result

@@ -186,8 +186,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1;
 c1
 1
@@ -410,8 +410,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 26
@@ -423,8 +423,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 1
@@ -441,8 +441,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=102 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 # Test with two threads
 connection default;
@@ -701,8 +701,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (4);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -710,8 +710,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (0);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -719,8 +719,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -728,8 +728,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 4
@@ -744,8 +744,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=301 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (0);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -753,8 +753,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=301 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -762,8 +762,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=302 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 0
@@ -785,8 +785,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -794,8 +794,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1;
 c1
 1
@@ -806,8 +806,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -815,8 +815,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=24 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SET INSERT_ID = 22;
 INSERT INTO t1 VALUES (NULL), (NULL), (NULL);
 INSERT INTO t1 VALUES (NULL);
@@ -839,8 +839,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 FLUSH TABLE;
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -848,8 +848,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 VALUES (4);
 FLUSH TABLE;
 SHOW CREATE TABLE t1;
@@ -858,8 +858,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 VALUES (NULL);
 FLUSH TABLE;
 SHOW CREATE TABLE t1;
@@ -868,8 +868,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 4

mysql-test/suite/parts/r/partition_auto_increment_maria.result

@@ -186,8 +186,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=Aria AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1;
 c1
 1
@@ -410,8 +410,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=Aria AUTO_INCREMENT=27 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 26
@@ -423,8 +423,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=Aria AUTO_INCREMENT=28 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 27
@@ -440,8 +440,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=Aria AUTO_INCREMENT=102 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 # Test with two threads
 connection default;
@@ -747,8 +747,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=Aria AUTO_INCREMENT=15 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (4);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -756,8 +756,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=Aria AUTO_INCREMENT=15 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (0);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -765,8 +765,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=Aria AUTO_INCREMENT=16 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -774,8 +774,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=Aria AUTO_INCREMENT=17 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 4
@@ -790,8 +790,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=Aria AUTO_INCREMENT=301 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (0);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -799,8 +799,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=Aria AUTO_INCREMENT=301 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -808,8 +808,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=Aria AUTO_INCREMENT=302 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 0
@@ -831,8 +831,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -840,8 +840,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=Aria AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1;
 c1
 1
@@ -852,8 +852,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=Aria AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -861,8 +861,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=Aria AUTO_INCREMENT=24 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SET INSERT_ID = 22;
 INSERT INTO t1 VALUES (NULL), (NULL), (NULL);
 INSERT INTO t1 VALUES (NULL);
@@ -886,8 +886,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 FLUSH TABLE;
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -895,8 +895,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=Aria DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 VALUES (4);
 FLUSH TABLE;
 SHOW CREATE TABLE t1;
@@ -905,8 +905,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=Aria AUTO_INCREMENT=5 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 VALUES (NULL);
 FLUSH TABLE;
 SHOW CREATE TABLE t1;
@@ -915,8 +915,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=Aria AUTO_INCREMENT=6 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 4

mysql-test/suite/parts/r/partition_auto_increment_memory.result

@@ -186,8 +186,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MEMORY AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1;
 c1
 1
@@ -410,8 +410,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MEMORY AUTO_INCREMENT=27 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 26
@@ -423,8 +423,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MEMORY AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 1
@@ -440,8 +440,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MEMORY AUTO_INCREMENT=102 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 # Test with two threads
 connection default;
@@ -728,8 +728,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MEMORY AUTO_INCREMENT=15 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (4);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -737,8 +737,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MEMORY AUTO_INCREMENT=15 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (0);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -746,8 +746,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MEMORY AUTO_INCREMENT=16 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -755,8 +755,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MEMORY AUTO_INCREMENT=17 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 4
@@ -771,8 +771,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MEMORY AUTO_INCREMENT=301 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (0);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -780,8 +780,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MEMORY AUTO_INCREMENT=301 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -789,8 +789,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MEMORY AUTO_INCREMENT=302 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 0
@@ -812,8 +812,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -821,8 +821,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MEMORY AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1;
 c1
 1
@@ -833,8 +833,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MEMORY AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -842,8 +842,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MEMORY AUTO_INCREMENT=24 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SET INSERT_ID = 22;
 INSERT INTO t1 VALUES (NULL), (NULL), (NULL);
 INSERT INTO t1 VALUES (NULL);
@@ -867,8 +867,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 FLUSH TABLE;
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -876,8 +876,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 VALUES (4);
 FLUSH TABLE;
 SHOW CREATE TABLE t1;
@@ -886,8 +886,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MEMORY AUTO_INCREMENT=5 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 VALUES (NULL);
 FLUSH TABLE;
 SHOW CREATE TABLE t1;
@@ -896,8 +896,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MEMORY AUTO_INCREMENT=6 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 4

mysql-test/suite/parts/r/partition_auto_increment_myisam.result

@@ -186,8 +186,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1;
 c1
 1
@@ -410,8 +410,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM AUTO_INCREMENT=27 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 26
@@ -423,8 +423,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 1
@@ -440,8 +440,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM AUTO_INCREMENT=102 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 DROP TABLE t1;
 # Test with two threads
 connection default;
@@ -747,8 +747,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM AUTO_INCREMENT=15 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (4);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -756,8 +756,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM AUTO_INCREMENT=15 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (0);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -765,8 +765,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM AUTO_INCREMENT=16 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -774,8 +774,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM AUTO_INCREMENT=17 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 4
@@ -790,8 +790,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM AUTO_INCREMENT=301 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (0);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -799,8 +799,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM AUTO_INCREMENT=301 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -808,8 +808,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM AUTO_INCREMENT=302 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 0
@@ -831,8 +831,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -840,8 +840,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1;
 c1
 1
@@ -852,8 +852,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 (c1) VALUES (NULL);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -861,8 +861,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM AUTO_INCREMENT=24 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SET INSERT_ID = 22;
 INSERT INTO t1 VALUES (NULL), (NULL), (NULL);
 INSERT INTO t1 VALUES (NULL);
@@ -886,8 +886,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 FLUSH TABLE;
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -895,8 +895,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 VALUES (4);
 FLUSH TABLE;
 SHOW CREATE TABLE t1;
@@ -905,8 +905,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 INSERT INTO t1 VALUES (NULL);
 FLUSH TABLE;
 SHOW CREATE TABLE t1;
@@ -915,8 +915,8 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM AUTO_INCREMENT=6 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
-PARTITIONS 2 */
+PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 4

mysql-test/suite/parts/r/partition_basic_innodb.result

@@ -73,8 +73,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.ibd
@@ -530,8 +530,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.ibd
@@ -998,7 +998,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -1006,7 +1006,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 unified filelist
 t1#P#part0.ibd
@@ -1474,13 +1474,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 unified filelist
 t1#P#parta.ibd
@@ -1942,13 +1942,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 unified filelist
 t1#P#parta#SP#partasp0.ibd
@@ -2418,7 +2418,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -2431,7 +2431,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 unified filelist
 t1#P#part1#SP#subpart11.ibd
@@ -2903,7 +2903,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -2916,7 +2916,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 unified filelist
 t1#P#part1#SP#sp11.ibd
@@ -3382,12 +3382,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 unified filelist
 t1#P#part1#SP#part1sp0.ibd
@@ -3852,8 +3852,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.ibd
@@ -4309,8 +4309,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.ibd
@@ -4777,7 +4777,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -4785,7 +4785,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 unified filelist
 t1#P#part0.ibd
@@ -5253,13 +5253,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 unified filelist
 t1#P#parta.ibd
@@ -5721,13 +5721,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 unified filelist
 t1#P#parta#SP#partasp0.ibd
@@ -6195,7 +6195,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -6208,7 +6208,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 unified filelist
 t1#P#part1#SP#subpart11.ibd
@@ -6676,7 +6676,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -6689,7 +6689,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 unified filelist
 t1#P#part1#SP#sp11.ibd
@@ -7155,12 +7155,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 unified filelist
 t1#P#part1#SP#part1sp0.ibd
@@ -7631,8 +7631,8 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.ibd
@@ -8125,8 +8125,8 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.ibd
@@ -8630,7 +8630,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -8638,7 +8638,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 unified filelist
 t1#P#part0.ibd
@@ -9143,13 +9143,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 unified filelist
 t1#P#parta.ibd
@@ -9648,13 +9648,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 unified filelist
 t1#P#parta#SP#partasp0.ibd
@@ -10161,7 +10161,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -10174,7 +10174,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 unified filelist
 t1#P#part1#SP#subpart11.ibd
@@ -10683,7 +10683,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -10696,7 +10696,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 unified filelist
 t1#P#part1#SP#sp11.ibd
@@ -11199,12 +11199,12 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 unified filelist
 t1#P#part1#SP#part1sp0.ibd
@@ -11705,8 +11705,8 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.ibd
@@ -12199,8 +12199,8 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.ibd
@@ -12704,7 +12704,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -12712,7 +12712,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 unified filelist
 t1#P#part0.ibd
@@ -13217,13 +13217,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 unified filelist
 t1#P#parta.ibd
@@ -13722,13 +13722,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 unified filelist
 t1#P#parta#SP#partasp0.ibd
@@ -14235,7 +14235,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -14248,7 +14248,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 unified filelist
 t1#P#part1#SP#subpart11.ibd
@@ -14757,7 +14757,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -14770,7 +14770,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 unified filelist
 t1#P#part1#SP#sp11.ibd
@@ -15273,12 +15273,12 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 unified filelist
 t1#P#part1#SP#part1sp0.ibd
@@ -15779,8 +15779,8 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.ibd
@@ -16289,8 +16289,8 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.ibd
@@ -16810,7 +16810,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -16818,7 +16818,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 unified filelist
 t1#P#part0.ibd
@@ -17339,13 +17339,13 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 unified filelist
 t1#P#parta.ibd
@@ -17860,13 +17860,13 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 unified filelist
 t1#P#parta#SP#partasp0.ibd
@@ -18389,7 +18389,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -18402,7 +18402,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 unified filelist
 t1#P#part1#SP#subpart11.ibd
@@ -18927,7 +18927,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -18940,7 +18940,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 unified filelist
 t1#P#part1#SP#sp11.ibd
@@ -19459,12 +19459,12 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 unified filelist
 t1#P#part1#SP#part1sp0.ibd
@@ -19986,8 +19986,8 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.ibd
@@ -20480,8 +20480,8 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.ibd
@@ -20985,7 +20985,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -20993,7 +20993,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 unified filelist
 t1#P#part0.ibd
@@ -21498,13 +21498,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 unified filelist
 t1#P#parta.ibd
@@ -22003,13 +22003,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 unified filelist
 t1#P#parta#SP#partasp0.ibd
@@ -22514,7 +22514,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -22527,7 +22527,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 unified filelist
 t1#P#part1#SP#subpart11.ibd
@@ -23032,7 +23032,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -23045,7 +23045,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 unified filelist
 t1#P#part1#SP#sp11.ibd
@@ -23548,12 +23548,12 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`),
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 unified filelist
 t1#P#part1#SP#part1sp0.ibd
@@ -24054,8 +24054,8 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.ibd
@@ -24548,8 +24548,8 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.ibd
@@ -25053,7 +25053,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -25061,7 +25061,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 unified filelist
 t1#P#part0.ibd
@@ -25566,13 +25566,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 unified filelist
 t1#P#parta.ibd
@@ -26071,13 +26071,13 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 unified filelist
 t1#P#parta#SP#partasp0.ibd
@@ -26582,7 +26582,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -26595,7 +26595,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 unified filelist
 t1#P#part1#SP#subpart11.ibd
@@ -27100,7 +27100,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -27113,7 +27113,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 unified filelist
 t1#P#part1#SP#sp11.ibd
@@ -27616,12 +27616,12 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 unified filelist
 t1#P#part1#SP#part1sp0.ibd
@@ -28122,8 +28122,8 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.ibd
@@ -28632,8 +28632,8 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.ibd
@@ -29153,7 +29153,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (-2) ENGINE = InnoDB,
  PARTITION part_1 VALUES IN (-1) ENGINE = InnoDB,
@@ -29161,7 +29161,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part1 VALUES IN (1) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (2) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (3) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (3) ENGINE = InnoDB)
 
 unified filelist
 t1#P#part0.ibd
@@ -29682,13 +29682,13 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION partd VALUES LESS THAN (15) ENGINE = InnoDB,
  PARTITION parte VALUES LESS THAN (20) ENGINE = InnoDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 unified filelist
 t1#P#parta.ibd
@@ -30203,13 +30203,13 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = InnoDB,
  PARTITION partb VALUES LESS THAN (5) ENGINE = InnoDB,
  PARTITION partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = InnoDB)
 
 unified filelist
 t1#P#parta#SP#partasp0.ibd
@@ -30730,7 +30730,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
@@ -30743,7 +30743,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = InnoDB),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = InnoDB,
-  SUBPARTITION subpart42 ENGINE = InnoDB)) */
+  SUBPARTITION subpart42 ENGINE = InnoDB))
 
 unified filelist
 t1#P#part1#SP#subpart11.ibd
@@ -31264,7 +31264,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = InnoDB,
@@ -31277,7 +31277,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = InnoDB),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = InnoDB,
-  SUBPARTITION sp42 ENGINE = InnoDB)) */
+  SUBPARTITION sp42 ENGINE = InnoDB))
 
 unified filelist
 t1#P#part1#SP#sp11.ibd
@@ -31796,12 +31796,12 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = InnoDB)
 
 unified filelist
 t1#P#part1#SP#part1sp0.ibd

mysql-test/suite/parts/r/partition_basic_myisam.result

@@ -73,8 +73,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -533,8 +533,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -1007,7 +1007,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -1015,7 +1015,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -1492,13 +1492,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -1967,13 +1967,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -2452,7 +2452,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -2465,7 +2465,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -2946,7 +2946,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -2959,7 +2959,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -3434,12 +3434,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD
@@ -3914,8 +3914,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -4374,8 +4374,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -4848,7 +4848,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -4856,7 +4856,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -5333,13 +5333,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -5808,13 +5808,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -6291,7 +6291,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -6304,7 +6304,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -6781,7 +6781,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -6794,7 +6794,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -7269,12 +7269,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD
@@ -7755,8 +7755,8 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -8268,8 +8268,8 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -8795,7 +8795,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -8803,7 +8803,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -9333,13 +9333,13 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -9861,13 +9861,13 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -10399,7 +10399,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -10412,7 +10412,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -10946,7 +10946,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -10959,7 +10959,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -11487,12 +11487,12 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD
@@ -12024,8 +12024,8 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -12537,8 +12537,8 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
-PARTITIONS 5 */
+PARTITIONS 5
 
 unified filelist
 t1#P#p0.MYD
@@ -13064,7 +13064,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) ENGINE = MyISAM,
@@ -13072,7 +13072,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -13602,13 +13602,13 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -14130,13 +14130,13 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -14666,7 +14666,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
@@ -14679,7 +14679,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -15209,7 +15209,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 ENGINE = MyISAM,
@@ -15222,7 +15222,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 ENGINE = MyISAM,
-  SUBPARTITION sp42 ENGINE = MyISAM)) */
+  SUBPARTITION sp42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -15750,12 +15750,12 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD

mysql-test/suite/parts/r/partition_basic_symlink_innodb.result

@@ -70,9 +70,9 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
 (PARTITION p0 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = InnoDB,
- PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = InnoDB) */
+ PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = InnoDB)
 #
 # Verify that the DATA/INDEX DIRECTORY is stored and used if we
 # ALTER TABLE to MyISAM.
@@ -83,9 +83,9 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
 (PARTITION p0 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM,
- PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM) */
+ PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM)
 # Verifying .frm, .par and MyISAM files (.MYD, MYI)
 ---- MYSQLD_DATADIR/test
 t1#P#p0.MYD
@@ -110,9 +110,9 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (c1)
+ PARTITION BY HASH (c1)
 (PARTITION p0 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = InnoDB,
- PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = InnoDB) */
+ PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = InnoDB)
 # Verifying .frm, .par, .isl and InnoDB .ibd files
 ---- MYSQLD_DATADIR/test
 t1#P#p0.isl

mysql-test/suite/parts/r/partition_basic_symlink_myisam.result

@@ -83,9 +83,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
 (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#p1.MYD
@@ -563,12 +563,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
 (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#p1.MYD
@@ -1059,7 +1059,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
@@ -1067,7 +1067,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -1572,13 +1572,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -2067,13 +2067,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -2572,7 +2572,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
@@ -2585,7 +2585,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
-  SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -3102,7 +3102,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
@@ -3115,7 +3115,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
-  SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */
+  SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -3612,12 +3612,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD
@@ -4116,9 +4116,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
 (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#p1.MYD
@@ -4596,12 +4596,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
 (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#p1.MYD
@@ -5092,7 +5092,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
@@ -5100,7 +5100,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -5605,13 +5605,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -6100,13 +6100,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -6603,7 +6603,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
@@ -6616,7 +6616,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
-  SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -7133,7 +7133,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
@@ -7146,7 +7146,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
-  SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */
+  SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -7643,12 +7643,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD
@@ -8153,9 +8153,9 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
 (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#p1.MYD
@@ -8686,12 +8686,12 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (f_int1)
 (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#p1.MYD
@@ -9235,7 +9235,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
@@ -9243,7 +9243,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -9801,13 +9801,13 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -10349,13 +10349,13 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -10907,7 +10907,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
@@ -10920,7 +10920,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
-  SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -11490,7 +11490,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
@@ -11503,7 +11503,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
-  SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */
+  SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -12053,12 +12053,12 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD
@@ -12614,9 +12614,9 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (f_int1 + f_int2)
 (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#p1.MYD
@@ -13147,12 +13147,12 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (f_int1,f_int2)
 (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION p4 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION p5 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#p1.MYD
@@ -13696,7 +13696,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST (MOD(f_int1 + f_int2,4))
 (PARTITION part_3 VALUES IN (-3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
@@ -13704,7 +13704,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -14262,13 +14262,13 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -14810,13 +14810,13 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int2)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -15366,7 +15366,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
@@ -15379,7 +15379,7 @@ SUBPARTITION BY KEY (f_int2)
   SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
-  SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -15949,7 +15949,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int2 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
@@ -15962,7 +15962,7 @@ SUBPARTITION BY HASH (f_int2 + 1)
   SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
-  SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */
+  SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD
@@ -16512,12 +16512,12 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (NULL) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1#SP#part1sp0.MYD
@@ -17069,9 +17069,9 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
 (PARTITION p1 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
- PARTITION p2 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION p2 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#p1.MYD
@@ -17595,12 +17595,12 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
 (PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM,
  PARTITION p2 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION p4 ENGINE = MyISAM,
- PARTITION p5 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION p5 INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#p1.MYD
@@ -18139,7 +18139,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (MOD(f_int1,4))
 (PARTITION part_3 VALUES IN (-3) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (-2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM,
  PARTITION part_1 VALUES IN (-1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
@@ -18147,7 +18147,7 @@ t1	CREATE TABLE `t1` (
  PARTITION part0 VALUES IN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION part1 VALUES IN (1) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM,
- PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION part3 VALUES IN (3) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#part0.MYD
@@ -18692,13 +18692,13 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION partd VALUES LESS THAN (15) ENGINE = MyISAM,
  PARTITION parte VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM,
- PARTITION partf VALUES LESS THAN (2147483646) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION partf VALUES LESS THAN (2147483646) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta.MYD
@@ -19230,13 +19230,13 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (f_int1 DIV 2)
 SUBPARTITION BY HASH (f_int1)
 SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0) INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
  PARTITION partb VALUES LESS THAN (5) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM,
  PARTITION partc VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM) */
+ PARTITION partd VALUES LESS THAN (2147483646) DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)
 
 unified filelist
 t1#P#parta#SP#partasp0.MYD
@@ -19781,7 +19781,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM,
@@ -19794,7 +19794,7 @@ SUBPARTITION BY KEY (f_int1)
   SUBPARTITION subpart32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM),
  PARTITION part4 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart41 ENGINE = MyISAM,
-  SUBPARTITION subpart42 ENGINE = MyISAM)) */
+  SUBPARTITION subpart42 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -20324,7 +20324,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (ABS(MOD(f_int1,3)))
 SUBPARTITION BY HASH (f_int1 + 1)
 (PARTITION part1 VALUES IN (0)
  (SUBPARTITION sp11 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
@@ -20337,7 +20337,7 @@ SUBPARTITION BY HASH (f_int1 + 1)
   SUBPARTITION sp32 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM),
  PARTITION part4 VALUES IN (NULL)
  (SUBPARTITION sp41 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM,
-  SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM)) */
+  SUBPARTITION sp42 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#sp11.MYD

mysql-test/suite/parts/r/partition_bit_innodb.result

@@ -9,7 +9,7 @@ t1	CREATE TABLE `t1` (
   `a` bit(1) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a) */
+ PARTITION BY KEY (a)
 drop table t1;
 create table t1 (a bit(0), primary key (a)) engine='INNODB' 
 partition by key (a) (
@@ -21,9 +21,9 @@ t1	CREATE TABLE `t1` (
   `a` bit(1) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 ENGINE = InnoDB,
- PARTITION pa2 ENGINE = InnoDB) */
+ PARTITION pa2 ENGINE = InnoDB)
 drop table t1;
 create table t1 (a bit(64), primary key (a)) engine='INNODB' 
 partition by key (a) partitions 2;
@@ -33,8 +33,8 @@ t1	CREATE TABLE `t1` (
   `a` bit(64) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 2 */
+PARTITIONS 2
 insert into t1 values 
 (b'1111111111111111111111111111111111111111111111111111111111111111'),
 (b'1000000000000000000000000000000000000000000000000000000000000000'),
@@ -61,11 +61,11 @@ t1	CREATE TABLE `t1` (
   `a` bit(64) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB)
 insert into t1 values 
 (b'1111111111111111111111111111111111111111111111111111111111111111'),
 (b'1000000000000000000000000000000000000000000000000000000000000000'),
@@ -91,8 +91,8 @@ t2	CREATE TABLE `t2` (
   `a` bit(1) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 4 */
+PARTITIONS 4
 insert into t2 values (b'0'), (b'1');
 select hex(a) from t2;
 hex(a)
@@ -104,8 +104,8 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `a` bit(1) NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 4 */
+PARTITIONS 4
 select hex(a) from t2;
 hex(a)
 0
@@ -117,8 +117,8 @@ t2	CREATE TABLE `t2` (
   `a` bit(1) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 4 */
+PARTITIONS 4
 select hex(a) from t2;
 hex(a)
 0
@@ -136,13 +136,13 @@ t3	CREATE TABLE `t3` (
   `a` bit(8) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 SUBPARTITION BY KEY (a)
 SUBPARTITIONS 2
 (PARTITION pa1 VALUES LESS THAN (3) ENGINE = InnoDB,
  PARTITION pa2 VALUES LESS THAN (16) ENGINE = InnoDB,
  PARTITION pa3 VALUES LESS THAN (64) ENGINE = InnoDB,
- PARTITION pa4 VALUES LESS THAN (256) ENGINE = InnoDB) */
+ PARTITION pa4 VALUES LESS THAN (256) ENGINE = InnoDB)
 255 inserts;
 select hex(a) from t3 where a=b'01010101';
 hex(a)
@@ -419,12 +419,12 @@ t4	CREATE TABLE `t4` (
   `a` bit(8) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 SUBPARTITION BY KEY (a)
 SUBPARTITIONS 2
 (PARTITION pa1 VALUES IN (0,1,2,3) ENGINE = InnoDB,
  PARTITION pa2 VALUES IN (4,5,6,7,8,9,10,11,12,13,14,15,16) ENGINE = InnoDB,
- PARTITION pa3 VALUES IN (17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32) ENGINE = InnoDB) */
+ PARTITION pa3 VALUES IN (17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32) ENGINE = InnoDB)
 32 inserts;
 select hex(a) from t4 where a=b'00000001';
 hex(a)

mysql-test/suite/parts/r/partition_bit_myisam.result

@@ -9,7 +9,7 @@ t1	CREATE TABLE `t1` (
   `a` bit(1) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a) */
+ PARTITION BY KEY (a)
 drop table t1;
 create table t1 (a bit(0), primary key (a)) engine='MyISAM' 
 partition by key (a) (
@@ -21,9 +21,9 @@ t1	CREATE TABLE `t1` (
   `a` bit(1) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 ENGINE = MyISAM,
- PARTITION pa2 ENGINE = MyISAM) */
+ PARTITION pa2 ENGINE = MyISAM)
 drop table t1;
 create table t1 (a bit(64), primary key (a)) engine='MyISAM' 
 partition by key (a) partitions 2;
@@ -33,8 +33,8 @@ t1	CREATE TABLE `t1` (
   `a` bit(64) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 2 */
+PARTITIONS 2
 insert into t1 values 
 (b'1111111111111111111111111111111111111111111111111111111111111111'),
 (b'1000000000000000000000000000000000000000000000000000000000000000'),
@@ -61,11 +61,11 @@ t1	CREATE TABLE `t1` (
   `a` bit(64) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM)
 insert into t1 values 
 (b'1111111111111111111111111111111111111111111111111111111111111111'),
 (b'1000000000000000000000000000000000000000000000000000000000000000'),
@@ -91,8 +91,8 @@ t2	CREATE TABLE `t2` (
   `a` bit(1) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 4 */
+PARTITIONS 4
 insert into t2 values (b'0'), (b'1');
 select hex(a) from t2;
 hex(a)
@@ -104,8 +104,8 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `a` bit(1) NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 4 */
+PARTITIONS 4
 select hex(a) from t2;
 hex(a)
 0
@@ -117,8 +117,8 @@ t2	CREATE TABLE `t2` (
   `a` bit(1) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 4 */
+PARTITIONS 4
 select hex(a) from t2;
 hex(a)
 0
@@ -136,13 +136,13 @@ t3	CREATE TABLE `t3` (
   `a` bit(8) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 SUBPARTITION BY KEY (a)
 SUBPARTITIONS 2
 (PARTITION pa1 VALUES LESS THAN (3) ENGINE = MyISAM,
  PARTITION pa2 VALUES LESS THAN (16) ENGINE = MyISAM,
  PARTITION pa3 VALUES LESS THAN (64) ENGINE = MyISAM,
- PARTITION pa4 VALUES LESS THAN (256) ENGINE = MyISAM) */
+ PARTITION pa4 VALUES LESS THAN (256) ENGINE = MyISAM)
 255 inserts;
 select hex(a) from t3 where a=b'01010101';
 hex(a)
@@ -419,12 +419,12 @@ t4	CREATE TABLE `t4` (
   `a` bit(8) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 SUBPARTITION BY KEY (a)
 SUBPARTITIONS 2
 (PARTITION pa1 VALUES IN (0,1,2,3) ENGINE = MyISAM,
  PARTITION pa2 VALUES IN (4,5,6,7,8,9,10,11,12,13,14,15,16) ENGINE = MyISAM,
- PARTITION pa3 VALUES IN (17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32) ENGINE = MyISAM) */
+ PARTITION pa3 VALUES IN (17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32) ENGINE = MyISAM)
 32 inserts;
 select hex(a) from t4 where a=b'00000001';
 hex(a)

mysql-test/suite/parts/r/partition_datetime_innodb.result

@@ -10,11 +10,11 @@ t1	CREATE TABLE `t1` (
   `a` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB)
 insert into t1 values ('1975-01-01 21:21:21'), ('2020-12-31 12:10:30'), ('1980-10-14 03:03'), ('2000-06-15 23:59');
 select * from t1;
 a
@@ -40,8 +40,8 @@ t2	CREATE TABLE `t2` (
   `a` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 12 */
+PARTITIONS 12
 insert into t2 values ('1975-01-01 0:1:1'), ('2020-12-31 10:11:12'), ('1980-10-14 13:14:15'), ('2000-06-15 14:15:16');
 select * from t2;
 a
@@ -137,11 +137,11 @@ t1	CREATE TABLE `t1` (
   `a` date NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB)
 insert into t1 values ('1975-01-01'), ('2020-12-31'), ('1980-10-14'), ('2000-06-15');
 select * from t1;
 a
@@ -167,8 +167,8 @@ t2	CREATE TABLE `t2` (
   `a` date NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 12 */
+PARTITIONS 12
 insert into t2 values ('1975-01-01'), ('2020-12-31'), ('1980-10-14'), ('2000-06-15');
 select * from t2;
 a
@@ -291,13 +291,13 @@ t3	CREATE TABLE `t3` (
   `a` date NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (month(a))
+ PARTITION BY RANGE (month(a))
 SUBPARTITION BY KEY (a)
 SUBPARTITIONS 3
 (PARTITION quarter1 VALUES LESS THAN (4) ENGINE = InnoDB,
  PARTITION quarter2 VALUES LESS THAN (7) ENGINE = InnoDB,
  PARTITION quarter3 VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION quarter4 VALUES LESS THAN (13) ENGINE = InnoDB) */
+ PARTITION quarter4 VALUES LESS THAN (13) ENGINE = InnoDB)
 12 inserts;
 select count(*) from t3;
 count(*)
@@ -331,13 +331,13 @@ t4	CREATE TABLE `t4` (
   `a` date NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (month(a))
+ PARTITION BY LIST (month(a))
 SUBPARTITION BY KEY (a)
 SUBPARTITIONS 3
 (PARTITION quarter1 VALUES IN (1,2,3) ENGINE = InnoDB,
  PARTITION quarter2 VALUES IN (4,5,6) ENGINE = InnoDB,
  PARTITION quarter3 VALUES IN (7,8,9) ENGINE = InnoDB,
- PARTITION quarter4 VALUES IN (10,11,12) ENGINE = InnoDB) */
+ PARTITION quarter4 VALUES IN (10,11,12) ENGINE = InnoDB)
 12 inserts;
 select count(*) from t4;
 count(*)
@@ -369,11 +369,11 @@ t1	CREATE TABLE `t1` (
   `a` time NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB)
 insert into t1 values ('21:21:21'), ('12:10:30'), ('03:03:03'), ('23:59');
 select * from t1;
 a
@@ -399,8 +399,8 @@ t2	CREATE TABLE `t2` (
   `a` time NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 12 */
+PARTITIONS 12
 insert into t2 values ('0:1:1'), ('10:11:12'), ('13:14:15'), ('14:15:16');
 select * from t2;
 a
@@ -498,13 +498,13 @@ t3	CREATE TABLE `t3` (
   `a` time NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (second(a))
+ PARTITION BY RANGE (second(a))
 SUBPARTITION BY KEY (a)
 SUBPARTITIONS 3
 (PARTITION quarter1 VALUES LESS THAN (16) ENGINE = InnoDB,
  PARTITION quarter2 VALUES LESS THAN (31) ENGINE = InnoDB,
  PARTITION quarter3 VALUES LESS THAN (46) ENGINE = InnoDB,
- PARTITION quarter4 VALUES LESS THAN (61) ENGINE = InnoDB) */
+ PARTITION quarter4 VALUES LESS THAN (61) ENGINE = InnoDB)
 59 inserts;
 select count(*) from t3;
 count(*)
@@ -585,13 +585,13 @@ t4	CREATE TABLE `t4` (
   `a` time NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (second(a))
+ PARTITION BY LIST (second(a))
 SUBPARTITION BY KEY (a)
 SUBPARTITIONS 3
 (PARTITION quarter1 VALUES IN (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15) ENGINE = InnoDB,
  PARTITION quarter2 VALUES IN (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30) ENGINE = InnoDB,
  PARTITION quarter3 VALUES IN (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45) ENGINE = InnoDB,
- PARTITION quarter4 VALUES IN (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB) */
+ PARTITION quarter4 VALUES IN (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60) ENGINE = InnoDB)
 59 inserts;
 select count(*) from t4;
 count(*)
@@ -670,11 +670,11 @@ t1	CREATE TABLE `t1` (
   `a` datetime NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB)
 insert into t1 values ('1975-01-01 21:21:21'), ('2020-12-31 12:10:30'), ('1980-10-14 03:03'), ('2000-06-15 23:59');
 select * from t1;
 a
@@ -700,8 +700,8 @@ t2	CREATE TABLE `t2` (
   `a` datetime NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 12 */
+PARTITIONS 12
 insert into t2 values ('1975-01-01 0:1:1'), ('2020-12-31 10:11:12'), ('1980-10-14 13:14:15'), ('2000-06-15 14:15:16');
 select * from t2;
 a
@@ -799,13 +799,13 @@ t3	CREATE TABLE `t3` (
   `a` datetime NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (month(a))
+ PARTITION BY RANGE (month(a))
 SUBPARTITION BY KEY (a)
 SUBPARTITIONS 3
 (PARTITION quarter1 VALUES LESS THAN (4) ENGINE = InnoDB,
  PARTITION quarter2 VALUES LESS THAN (7) ENGINE = InnoDB,
  PARTITION quarter3 VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION quarter4 VALUES LESS THAN (13) ENGINE = InnoDB) */
+ PARTITION quarter4 VALUES LESS THAN (13) ENGINE = InnoDB)
 12 inserts;
 select count(*) from t3;
 count(*)
@@ -839,13 +839,13 @@ t4	CREATE TABLE `t4` (
   `a` datetime NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (month(a))
+ PARTITION BY LIST (month(a))
 SUBPARTITION BY KEY (a)
 SUBPARTITIONS 3
 (PARTITION quarter1 VALUES IN (1,2,3) ENGINE = InnoDB,
  PARTITION quarter2 VALUES IN (4,5,6) ENGINE = InnoDB,
  PARTITION quarter3 VALUES IN (7,8,9) ENGINE = InnoDB,
- PARTITION quarter4 VALUES IN (10,11,12) ENGINE = InnoDB) */
+ PARTITION quarter4 VALUES IN (10,11,12) ENGINE = InnoDB)
 12 inserts;
 select count(*) from t4;
 count(*)
@@ -877,11 +877,11 @@ t1	CREATE TABLE `t1` (
   `a` year(4) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB)
 insert into t1 values ('1975'), (2020), ('1980'), ('2000');
 select * from t1;
 a
@@ -907,8 +907,8 @@ t2	CREATE TABLE `t2` (
   `a` year(4) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 12 */
+PARTITIONS 12
 insert into t2 values ('1975'), ('2020'), ('1980'), ('2000');
 select * from t2;
 a

mysql-test/suite/parts/r/partition_datetime_myisam.result

@@ -10,11 +10,11 @@ t1	CREATE TABLE `t1` (
   `a` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM)
 insert into t1 values ('1975-01-01 21:21:21'), ('2020-12-31 12:10:30'), ('1980-10-14 03:03'), ('2000-06-15 23:59');
 select * from t1;
 a
@@ -40,8 +40,8 @@ t2	CREATE TABLE `t2` (
   `a` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 12 */
+PARTITIONS 12
 insert into t2 values ('1975-01-01 0:1:1'), ('2020-12-31 10:11:12'), ('1980-10-14 13:14:15'), ('2000-06-15 14:15:16');
 select * from t2;
 a
@@ -137,11 +137,11 @@ t1	CREATE TABLE `t1` (
   `a` date NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM)
 insert into t1 values ('1975-01-01'), ('2020-12-31'), ('1980-10-14'), ('2000-06-15');
 select * from t1;
 a
@@ -167,8 +167,8 @@ t2	CREATE TABLE `t2` (
   `a` date NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 12 */
+PARTITIONS 12
 insert into t2 values ('1975-01-01'), ('2020-12-31'), ('1980-10-14'), ('2000-06-15');
 select * from t2;
 a
@@ -291,13 +291,13 @@ t3	CREATE TABLE `t3` (
   `a` date NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (month(a))
+ PARTITION BY RANGE (month(a))
 SUBPARTITION BY KEY (a)
 SUBPARTITIONS 3
 (PARTITION quarter1 VALUES LESS THAN (4) ENGINE = MyISAM,
  PARTITION quarter2 VALUES LESS THAN (7) ENGINE = MyISAM,
  PARTITION quarter3 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION quarter4 VALUES LESS THAN (13) ENGINE = MyISAM) */
+ PARTITION quarter4 VALUES LESS THAN (13) ENGINE = MyISAM)
 12 inserts;
 select count(*) from t3;
 count(*)
@@ -331,13 +331,13 @@ t4	CREATE TABLE `t4` (
   `a` date NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (month(a))
+ PARTITION BY LIST (month(a))
 SUBPARTITION BY KEY (a)
 SUBPARTITIONS 3
 (PARTITION quarter1 VALUES IN (1,2,3) ENGINE = MyISAM,
  PARTITION quarter2 VALUES IN (4,5,6) ENGINE = MyISAM,
  PARTITION quarter3 VALUES IN (7,8,9) ENGINE = MyISAM,
- PARTITION quarter4 VALUES IN (10,11,12) ENGINE = MyISAM) */
+ PARTITION quarter4 VALUES IN (10,11,12) ENGINE = MyISAM)
 12 inserts;
 select count(*) from t4;
 count(*)
@@ -369,11 +369,11 @@ t1	CREATE TABLE `t1` (
   `a` time NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM)
 insert into t1 values ('21:21:21'), ('12:10:30'), ('03:03:03'), ('23:59');
 select * from t1;
 a
@@ -399,8 +399,8 @@ t2	CREATE TABLE `t2` (
   `a` time NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 12 */
+PARTITIONS 12
 insert into t2 values ('0:1:1'), ('10:11:12'), ('13:14:15'), ('14:15:16');
 select * from t2;
 a
@@ -498,13 +498,13 @@ t3	CREATE TABLE `t3` (
   `a` time NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (second(a))
+ PARTITION BY RANGE (second(a))
 SUBPARTITION BY KEY (a)
 SUBPARTITIONS 3
 (PARTITION quarter1 VALUES LESS THAN (16) ENGINE = MyISAM,
  PARTITION quarter2 VALUES LESS THAN (31) ENGINE = MyISAM,
  PARTITION quarter3 VALUES LESS THAN (46) ENGINE = MyISAM,
- PARTITION quarter4 VALUES LESS THAN (61) ENGINE = MyISAM) */
+ PARTITION quarter4 VALUES LESS THAN (61) ENGINE = MyISAM)
 59 inserts;
 select count(*) from t3;
 count(*)
@@ -585,13 +585,13 @@ t4	CREATE TABLE `t4` (
   `a` time NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (second(a))
+ PARTITION BY LIST (second(a))
 SUBPARTITION BY KEY (a)
 SUBPARTITIONS 3
 (PARTITION quarter1 VALUES IN (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15) ENGINE = MyISAM,
  PARTITION quarter2 VALUES IN (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM,
  PARTITION quarter3 VALUES IN (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45) ENGINE = MyISAM,
- PARTITION quarter4 VALUES IN (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) */
+ PARTITION quarter4 VALUES IN (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM)
 59 inserts;
 select count(*) from t4;
 count(*)
@@ -670,11 +670,11 @@ t1	CREATE TABLE `t1` (
   `a` datetime NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM)
 insert into t1 values ('1975-01-01 21:21:21'), ('2020-12-31 12:10:30'), ('1980-10-14 03:03'), ('2000-06-15 23:59');
 select * from t1;
 a
@@ -700,8 +700,8 @@ t2	CREATE TABLE `t2` (
   `a` datetime NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 12 */
+PARTITIONS 12
 insert into t2 values ('1975-01-01 0:1:1'), ('2020-12-31 10:11:12'), ('1980-10-14 13:14:15'), ('2000-06-15 14:15:16');
 select * from t2;
 a
@@ -799,13 +799,13 @@ t3	CREATE TABLE `t3` (
   `a` datetime NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (month(a))
+ PARTITION BY RANGE (month(a))
 SUBPARTITION BY KEY (a)
 SUBPARTITIONS 3
 (PARTITION quarter1 VALUES LESS THAN (4) ENGINE = MyISAM,
  PARTITION quarter2 VALUES LESS THAN (7) ENGINE = MyISAM,
  PARTITION quarter3 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION quarter4 VALUES LESS THAN (13) ENGINE = MyISAM) */
+ PARTITION quarter4 VALUES LESS THAN (13) ENGINE = MyISAM)
 12 inserts;
 select count(*) from t3;
 count(*)
@@ -839,13 +839,13 @@ t4	CREATE TABLE `t4` (
   `a` datetime NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (month(a))
+ PARTITION BY LIST (month(a))
 SUBPARTITION BY KEY (a)
 SUBPARTITIONS 3
 (PARTITION quarter1 VALUES IN (1,2,3) ENGINE = MyISAM,
  PARTITION quarter2 VALUES IN (4,5,6) ENGINE = MyISAM,
  PARTITION quarter3 VALUES IN (7,8,9) ENGINE = MyISAM,
- PARTITION quarter4 VALUES IN (10,11,12) ENGINE = MyISAM) */
+ PARTITION quarter4 VALUES IN (10,11,12) ENGINE = MyISAM)
 12 inserts;
 select count(*) from t4;
 count(*)
@@ -877,11 +877,11 @@ t1	CREATE TABLE `t1` (
   `a` year(4) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM)
 insert into t1 values ('1975'), (2020), ('1980'), ('2000');
 select * from t1;
 a
@@ -907,8 +907,8 @@ t2	CREATE TABLE `t2` (
   `a` year(4) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 12 */
+PARTITIONS 12
 insert into t2 values ('1975'), ('2020'), ('1980'), ('2000');
 select * from t2;
 a

mysql-test/suite/parts/r/partition_debug.result

@@ -55,9 +55,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -100,9 +100,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -167,9 +167,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -212,9 +212,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -279,9 +279,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -324,9 +324,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -391,9 +391,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -436,9 +436,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -503,9 +503,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -548,9 +548,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -615,9 +615,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -660,9 +660,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -727,9 +727,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -772,9 +772,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -839,9 +839,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -884,9 +884,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -951,9 +951,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -996,9 +996,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 11	Original from partition p1
@@ -1063,9 +1063,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1098,9 +1098,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1165,9 +1165,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1200,9 +1200,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1267,9 +1267,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1302,9 +1302,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1369,9 +1369,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1404,9 +1404,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1471,9 +1471,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1506,9 +1506,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1573,9 +1573,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1608,9 +1608,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1675,9 +1675,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1710,9 +1710,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1777,9 +1777,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1812,9 +1812,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1879,9 +1879,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 1	Original from partition p0
@@ -1914,9 +1914,9 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(64) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t1;
 a	b
 11	Original from partition p1

mysql-test/suite/parts/r/partition_debug_sync_innodb.result

@@ -51,8 +51,8 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
-(PARTITION p0 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
+(PARTITION p0 VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -88,9 +88,9 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION p10 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
+ PARTITION p10 VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
 SELECT * FROM t1;
 a
 1

mysql-test/suite/parts/r/partition_decimal_innodb.result

@@ -10,11 +10,11 @@ t1	CREATE TABLE `t1` (
   `a` decimal(10,4) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB)
 insert into t1 values (999999.9999), (-999999.9999), (123456.7899), (-123456.7899), (-1.5), (1), (0), (-1), (1.5), (1234.567), (-1234.567);
 select * from t1;
 a
@@ -54,8 +54,8 @@ t2	CREATE TABLE `t2` (
   `a` decimal(18,9) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 10 */
+PARTITIONS 10
 insert into t2 values (999999999.999999999), (-999999999.999999999), (-1.5), (-1), (0), (1.5), (1234.567), (-1234.567);
 select * from t2;
 a
@@ -100,14 +100,14 @@ t3	CREATE TABLE `t3` (
   `a` decimal(18,9) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (floor(a))
+ PARTITION BY RANGE (floor(a))
 SUBPARTITION BY KEY (a)
 SUBPARTITIONS 2
 (PARTITION pa2 VALUES LESS THAN (2) ENGINE = InnoDB,
  PARTITION pa4 VALUES LESS THAN (4) ENGINE = InnoDB,
  PARTITION pa6 VALUES LESS THAN (6) ENGINE = InnoDB,
  PARTITION pa8 VALUES LESS THAN (8) ENGINE = InnoDB,
- PARTITION pa10 VALUES LESS THAN (10) ENGINE = InnoDB) */
+ PARTITION pa10 VALUES LESS THAN (10) ENGINE = InnoDB)
 9*3 inserts;
 select count(*) from t3;
 count(*)
@@ -127,14 +127,14 @@ t4	CREATE TABLE `t4` (
   `a` decimal(18,9) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ceiling(a))
+ PARTITION BY LIST (ceiling(a))
 SUBPARTITION BY KEY (a)
 SUBPARTITIONS 2
 (PARTITION pa2 VALUES IN (1,2) ENGINE = InnoDB,
  PARTITION pa4 VALUES IN (3,4) ENGINE = InnoDB,
  PARTITION pa6 VALUES IN (5,6) ENGINE = InnoDB,
  PARTITION pa8 VALUES IN (7,8) ENGINE = InnoDB,
- PARTITION pa10 VALUES IN (9,10) ENGINE = InnoDB) */
+ PARTITION pa10 VALUES IN (9,10) ENGINE = InnoDB)
 9*3 inserts;
 select count(*) from t4;
 count(*)

mysql-test/suite/parts/r/partition_decimal_myisam.result

@@ -10,11 +10,11 @@ t1	CREATE TABLE `t1` (
   `a` decimal(10,4) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM)
 insert into t1 values (999999.9999), (-999999.9999), (123456.7899), (-123456.7899), (-1.5), (1), (0), (-1), (1.5), (1234.567), (-1234.567);
 select * from t1;
 a
@@ -54,8 +54,8 @@ t2	CREATE TABLE `t2` (
   `a` decimal(18,9) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 10 */
+PARTITIONS 10
 insert into t2 values (999999999.999999999), (-999999999.999999999), (-1.5), (-1), (0), (1.5), (1234.567), (-1234.567);
 select * from t2;
 a
@@ -100,14 +100,14 @@ t3	CREATE TABLE `t3` (
   `a` decimal(18,9) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (floor(a))
+ PARTITION BY RANGE (floor(a))
 SUBPARTITION BY KEY (a)
 SUBPARTITIONS 2
 (PARTITION pa2 VALUES LESS THAN (2) ENGINE = MyISAM,
  PARTITION pa4 VALUES LESS THAN (4) ENGINE = MyISAM,
  PARTITION pa6 VALUES LESS THAN (6) ENGINE = MyISAM,
  PARTITION pa8 VALUES LESS THAN (8) ENGINE = MyISAM,
- PARTITION pa10 VALUES LESS THAN (10) ENGINE = MyISAM) */
+ PARTITION pa10 VALUES LESS THAN (10) ENGINE = MyISAM)
 9*3 inserts;
 select count(*) from t3;
 count(*)
@@ -127,14 +127,14 @@ t4	CREATE TABLE `t4` (
   `a` decimal(18,9) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (ceiling(a))
+ PARTITION BY LIST (ceiling(a))
 SUBPARTITION BY KEY (a)
 SUBPARTITIONS 2
 (PARTITION pa2 VALUES IN (1,2) ENGINE = MyISAM,
  PARTITION pa4 VALUES IN (3,4) ENGINE = MyISAM,
  PARTITION pa6 VALUES IN (5,6) ENGINE = MyISAM,
  PARTITION pa8 VALUES IN (7,8) ENGINE = MyISAM,
- PARTITION pa10 VALUES IN (9,10) ENGINE = MyISAM) */
+ PARTITION pa10 VALUES IN (9,10) ENGINE = MyISAM)
 9*3 inserts;
 select count(*) from t4;
 count(*)

mysql-test/suite/parts/r/partition_engine_innodb.result

@@ -68,8 +68,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -525,9 +525,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
 (PARTITION part1 ENGINE = InnoDB,
- PARTITION part2 ENGINE = InnoDB) */
+ PARTITION part2 ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -984,14 +984,14 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int1)
 (PARTITION part1 VALUES LESS THAN (10)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
  PARTITION part2 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart21 ENGINE = InnoDB,
-  SUBPARTITION subpart22 ENGINE = InnoDB)) */
+  SUBPARTITION subpart22 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1509,14 +1509,14 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int1)
 (PARTITION part1 VALUES LESS THAN (10)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
  PARTITION part2 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart21 ENGINE = InnoDB,
-  SUBPARTITION subpart22 ENGINE = InnoDB)) */
+  SUBPARTITION subpart22 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2010,14 +2010,14 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int1)
 (PARTITION part1 VALUES LESS THAN (10)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
  PARTITION part2 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart21 ENGINE = InnoDB,
-  SUBPARTITION subpart22 ENGINE = InnoDB)) */
+  SUBPARTITION subpart22 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2472,14 +2472,14 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int1)
 (PARTITION part1 VALUES LESS THAN (10)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
  PARTITION part2 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart21 ENGINE = InnoDB,
-  SUBPARTITION subpart22 ENGINE = InnoDB)) */
+  SUBPARTITION subpart22 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2934,9 +2934,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
 (PARTITION part1 ENGINE = InnoDB,
- PARTITION part2 ENGINE = InnoDB) */
+ PARTITION part2 ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3393,14 +3393,14 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int1)
 (PARTITION part1 VALUES LESS THAN (10)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
  PARTITION part2 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart21 ENGINE = InnoDB,
-  SUBPARTITION subpart22 ENGINE = InnoDB)) */
+  SUBPARTITION subpart22 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3858,14 +3858,14 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int1)
 (PARTITION part1 VALUES LESS THAN (10)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
  PARTITION part2 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart21 ENGINE = InnoDB,
-  SUBPARTITION subpart22 ENGINE = InnoDB)) */
+  SUBPARTITION subpart22 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4316,8 +4316,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-(PARTITION part1 ENGINE = InnoDB) */
+(PARTITION part1 ENGINE = InnoDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4770,11 +4770,11 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int1)
 (PARTITION part1 VALUES LESS THAN (1000)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
-  SUBPARTITION subpart12 ENGINE = InnoDB)) */
+  SUBPARTITION subpart12 ENGINE = InnoDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1

mysql-test/suite/parts/r/partition_engine_myisam.result

@@ -68,8 +68,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-PARTITIONS 2 */
+PARTITIONS 2
 
 unified filelist
 t1#P#p0.MYD
@@ -534,9 +534,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
 (PARTITION part1 ENGINE = MyISAM,
- PARTITION part2 ENGINE = MyISAM) */
+ PARTITION part2 ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1.MYD
@@ -1002,14 +1002,14 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int1)
 (PARTITION part1 VALUES LESS THAN (10)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
  PARTITION part2 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart21 ENGINE = MyISAM,
-  SUBPARTITION subpart22 ENGINE = MyISAM)) */
+  SUBPARTITION subpart22 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -1540,14 +1540,14 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int1)
 (PARTITION part1 VALUES LESS THAN (10)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
  PARTITION part2 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart21 ENGINE = MyISAM,
-  SUBPARTITION subpart22 ENGINE = MyISAM)) */
+  SUBPARTITION subpart22 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -2054,14 +2054,14 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int1)
 (PARTITION part1 VALUES LESS THAN (10)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
  PARTITION part2 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart21 ENGINE = MyISAM,
-  SUBPARTITION subpart22 ENGINE = MyISAM)) */
+  SUBPARTITION subpart22 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -2529,14 +2529,14 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int1)
 (PARTITION part1 VALUES LESS THAN (10)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
  PARTITION part2 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart21 ENGINE = MyISAM,
-  SUBPARTITION subpart22 ENGINE = MyISAM)) */
+  SUBPARTITION subpart22 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -3004,9 +3004,9 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
 (PARTITION part1 ENGINE = MyISAM,
- PARTITION part2 ENGINE = MyISAM) */
+ PARTITION part2 ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1.MYD
@@ -3472,14 +3472,14 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int1)
 (PARTITION part1 VALUES LESS THAN (10)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
  PARTITION part2 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart21 ENGINE = MyISAM,
-  SUBPARTITION subpart22 ENGINE = MyISAM)) */
+  SUBPARTITION subpart22 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -3950,14 +3950,14 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int1)
 (PARTITION part1 VALUES LESS THAN (10)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
  PARTITION part2 VALUES LESS THAN (2147483646)
  (SUBPARTITION subpart21 ENGINE = MyISAM,
-  SUBPARTITION subpart22 ENGINE = MyISAM)) */
+  SUBPARTITION subpart22 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD
@@ -4421,8 +4421,8 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (f_int1)
-(PARTITION part1 ENGINE = MyISAM) */
+(PARTITION part1 ENGINE = MyISAM)
 
 unified filelist
 t1#P#part1.MYD
@@ -4882,11 +4882,11 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (f_int1)
 SUBPARTITION BY HASH (f_int1)
 (PARTITION part1 VALUES LESS THAN (1000)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
-  SUBPARTITION subpart12 ENGINE = MyISAM)) */
+  SUBPARTITION subpart12 ENGINE = MyISAM))
 
 unified filelist
 t1#P#part1#SP#subpart11.MYD

mysql-test/suite/parts/r/partition_exch_qa_1_innodb.result

@@ -128,10 +128,10 @@ tp	CREATE TABLE `tp` (
   PRIMARY KEY (`a`),
   UNIQUE KEY `a` (`a`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION p1 VALUES LESS THAN (100) ENGINE = InnoDB,
- PARTITION p2 VALUES LESS THAN (1000) ENGINE = InnoDB) */
+ PARTITION p2 VALUES LESS THAN (1000) ENGINE = InnoDB)
 ALTER TABLE tp   DROP INDEX a;
 ALTER TABLE t_10 DROP INDEX a;
 ALTER TABLE tp   ADD UNIQUE INDEX USING BTREE (a,b);
@@ -153,10 +153,10 @@ tp	CREATE TABLE `tp` (
   PRIMARY KEY (`a`),
   UNIQUE KEY `a` (`a`,`b`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION p1 VALUES LESS THAN (100) ENGINE = InnoDB,
- PARTITION p2 VALUES LESS THAN (1000) ENGINE = InnoDB) */
+ PARTITION p2 VALUES LESS THAN (1000) ENGINE = InnoDB)
 DROP TABLE IF EXISTS t_10;
 DROP TABLE IF EXISTS t_100;
 DROP TABLE IF EXISTS t_1000;

mysql-test/suite/parts/r/partition_exch_qa_1_myisam.result

@@ -128,10 +128,10 @@ tp	CREATE TABLE `tp` (
   PRIMARY KEY (`a`),
   UNIQUE KEY `a` (`a`) USING BTREE
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION p1 VALUES LESS THAN (100) ENGINE = MyISAM,
- PARTITION p2 VALUES LESS THAN (1000) ENGINE = MyISAM) */
+ PARTITION p2 VALUES LESS THAN (1000) ENGINE = MyISAM)
 ALTER TABLE tp   DROP INDEX a;
 ALTER TABLE t_10 DROP INDEX a;
 ALTER TABLE tp   ADD UNIQUE INDEX USING BTREE (a,b);
@@ -153,10 +153,10 @@ tp	CREATE TABLE `tp` (
   PRIMARY KEY (`a`),
   UNIQUE KEY `a` (`a`,`b`) USING BTREE
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10) ENGINE = MyISAM,
  PARTITION p1 VALUES LESS THAN (100) ENGINE = MyISAM,
- PARTITION p2 VALUES LESS THAN (1000) ENGINE = MyISAM) */
+ PARTITION p2 VALUES LESS THAN (1000) ENGINE = MyISAM)
 DROP TABLE IF EXISTS t_10;
 DROP TABLE IF EXISTS t_100;
 DROP TABLE IF EXISTS t_1000;

mysql-test/suite/parts/r/partition_exchange_archive.result

@@ -14,8 +14,8 @@ tp	CREATE TABLE `tp` (
   `b` varchar(24) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
-PARTITIONS 4 */
+PARTITIONS 4
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
@@ -80,8 +80,8 @@ tp	CREATE TABLE `tp` (
   `b` varchar(24) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=ARCHIVE AUTO_INCREMENT=22 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
-PARTITIONS 4 */
+PARTITIONS 4
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
@@ -175,9 +175,9 @@ tp	CREATE TABLE `tp` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(55) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = ARCHIVE,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = ARCHIVE) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = ARCHIVE)
 SET DEBUG_SYNC= 'now SIGNAL goto_verification';
 SET DEBUG_SYNC= 'now WAIT_FOR swap_in_progress';
 # select from t and select/update/delete/insert from tp should work
@@ -208,9 +208,9 @@ tp	CREATE TABLE `tp` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(55) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = ARCHIVE,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = ARCHIVE) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = ARCHIVE)
 SET DEBUG_SYNC= 'now SIGNAL goto_wait';
 SET DEBUG_SYNC= 'now WAIT_FOR swap_in_progress';
 # Both tables should now be under exclusive lock, even SHOW should fail
@@ -265,9 +265,9 @@ tp	CREATE TABLE `tp` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(55) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = ARCHIVE,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = ARCHIVE) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = ARCHIVE)
 SELECT * FROM tp WHERE a = 99;
 a	b
 99	End of values
@@ -292,9 +292,9 @@ tp	CREATE TABLE `tp` (
   `a` int(11) DEFAULT NULL,
   `b` varchar(55) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = ARCHIVE,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = ARCHIVE) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = ARCHIVE)
 SELECT * FROM t;
 a	b
 10	Ten

mysql-test/suite/parts/r/partition_exchange_innodb.result

@@ -13,8 +13,8 @@ tp	CREATE TABLE `tp` (
   `b` varchar(24) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
-PARTITIONS 4 */
+PARTITIONS 4
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
@@ -86,8 +86,8 @@ tp	CREATE TABLE `tp` (
   `b` varchar(24) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB AUTO_INCREMENT=112 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
-PARTITIONS 4 */
+PARTITIONS 4
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
@@ -194,9 +194,9 @@ tp	CREATE TABLE `tp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = InnoDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
 SET DEBUG_SYNC= 'now SIGNAL goto_verification';
 SET DEBUG_SYNC= 'now WAIT_FOR swap_in_progress';
 # select from t and select/update/delete/insert from tp should work
@@ -237,9 +237,9 @@ tp	CREATE TABLE `tp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = InnoDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
 SET DEBUG_SYNC= 'now SIGNAL goto_wait';
 SET DEBUG_SYNC= 'now WAIT_FOR swap_in_progress';
 # Both tables should now be under exclusive lock, even SHOW should fail
@@ -312,9 +312,9 @@ tp	CREATE TABLE `tp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = InnoDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
 SELECT * FROM tp WHERE a = 99;
 a	b
 99	End of values
@@ -346,9 +346,9 @@ tp	CREATE TABLE `tp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = InnoDB,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
 SELECT * FROM t;
 a	b
 10	Ten

mysql-test/suite/parts/r/partition_exchange_memory.result

@@ -13,8 +13,8 @@ tp	CREATE TABLE `tp` (
   `b` varchar(24) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
-PARTITIONS 4 */
+PARTITIONS 4
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
@@ -86,8 +86,8 @@ tp	CREATE TABLE `tp` (
   `b` varchar(24) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MEMORY AUTO_INCREMENT=112 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
-PARTITIONS 4 */
+PARTITIONS 4
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
@@ -194,9 +194,9 @@ tp	CREATE TABLE `tp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = MEMORY,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MEMORY) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MEMORY)
 SET DEBUG_SYNC= 'now SIGNAL goto_verification';
 SET DEBUG_SYNC= 'now WAIT_FOR swap_in_progress';
 # select from t and select/update/delete/insert from tp should work
@@ -237,9 +237,9 @@ tp	CREATE TABLE `tp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = MEMORY,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MEMORY) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MEMORY)
 SET DEBUG_SYNC= 'now SIGNAL goto_wait';
 SET DEBUG_SYNC= 'now WAIT_FOR swap_in_progress';
 # Both tables should now be under exclusive lock, even SHOW should fail
@@ -312,9 +312,9 @@ tp	CREATE TABLE `tp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = MEMORY,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MEMORY) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MEMORY)
 SELECT * FROM tp WHERE a = 99;
 a	b
 99	End of values
@@ -346,9 +346,9 @@ tp	CREATE TABLE `tp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = MEMORY,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MEMORY) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MEMORY)
 SELECT * FROM t;
 a	b
 10	Ten

mysql-test/suite/parts/r/partition_exchange_myisam.result

@@ -13,8 +13,8 @@ tp	CREATE TABLE `tp` (
   `b` varchar(24) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
-PARTITIONS 4 */
+PARTITIONS 4
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
@@ -86,8 +86,8 @@ tp	CREATE TABLE `tp` (
   `b` varchar(24) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM AUTO_INCREMENT=112 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
-PARTITIONS 4 */
+PARTITIONS 4
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
@@ -194,9 +194,9 @@ tp	CREATE TABLE `tp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SET DEBUG_SYNC= 'now SIGNAL goto_verification';
 SET DEBUG_SYNC= 'now WAIT_FOR swap_in_progress';
 # select from t and select/update/delete/insert from tp should work
@@ -237,9 +237,9 @@ tp	CREATE TABLE `tp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SET DEBUG_SYNC= 'now SIGNAL goto_wait';
 SET DEBUG_SYNC= 'now WAIT_FOR swap_in_progress';
 # Both tables should now be under exclusive lock, even SHOW should fail
@@ -312,9 +312,9 @@ tp	CREATE TABLE `tp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM tp WHERE a = 99;
 a	b
 99	End of values
@@ -346,9 +346,9 @@ tp	CREATE TABLE `tp` (
   `b` varchar(55) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM,
- PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 SELECT * FROM t;
 a	b
 10	Ten

mysql-test/suite/parts/r/partition_float_innodb.result

@@ -10,11 +10,11 @@ t1	CREATE TABLE `t1` (
   `a` float NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB)
 insert into t1 values (-3.402823466E+38), (3.402823466E+38), (-1.5), (-1), (0), (1), (1.5);
 select * from t1;
 a
@@ -46,8 +46,8 @@ t2	CREATE TABLE `t2` (
   `a` float NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 10 */
+PARTITIONS 10
 insert into t2 values (-3.402823466E+38), (-3.402823466E+37), (-123.456), (0), (1234546.789), (123.456), (1.5);
 select * from t2;
 a
@@ -100,11 +100,11 @@ t1	CREATE TABLE `t1` (
   `a` double NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB)
 insert into t1 values (-2.2250738585072014E+208), (-2.2250738585072014E-208), (-1.5), (-1), (0), (1.5), (1234.567), (2.2250738585072014E+208);
 select * from t1;
 a
@@ -138,8 +138,8 @@ t2	CREATE TABLE `t2` (
   `a` double NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 10 */
+PARTITIONS 10
 insert into t2 values (-2.2250738585072014E+208), (-2.2250738585072014E-208), (-1.5), (-1), (0), (1.5), (1234.567), (2.2250738585072014E+208);
 select * from t2;
 a

mysql-test/suite/parts/r/partition_float_myisam.result

@@ -10,11 +10,11 @@ t1	CREATE TABLE `t1` (
   `a` float NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM)
 insert into t1 values (-3.402823466E+38), (3.402823466E+38), (-1.5), (-1), (0), (1), (1.5);
 select * from t1;
 a
@@ -46,8 +46,8 @@ t2	CREATE TABLE `t2` (
   `a` float NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 10 */
+PARTITIONS 10
 insert into t2 values (-3.402823466E+38), (-3.402823466E+37), (-123.456), (0), (1234546.789), (123.456), (1.5);
 select * from t2;
 a
@@ -100,11 +100,11 @@ t1	CREATE TABLE `t1` (
   `a` double NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM)
 insert into t1 values (-2.2250738585072014E+208), (-2.2250738585072014E-208), (-1.5), (-1), (0), (1.5), (1234.567), (2.2250738585072014E+208);
 select * from t1;
 a
@@ -138,8 +138,8 @@ t2	CREATE TABLE `t2` (
   `a` double NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 10 */
+PARTITIONS 10
 insert into t2 values (-2.2250738585072014E+208), (-2.2250738585072014E-208), (-1.5), (-1), (0), (1.5), (1234.567), (2.2250738585072014E+208);
 select * from t2;
 a

mysql-test/suite/parts/r/partition_int_innodb.result

@@ -10,11 +10,11 @@ t1	CREATE TABLE `t1` (
   `a` tinyint(3) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB)
 insert into t1 values (255), (254), (253), (252), (1), (2), (128);
 select * from t1;
 a
@@ -46,8 +46,8 @@ t2	CREATE TABLE `t2` (
   `a` tinyint(3) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 8 */
+PARTITIONS 8
 insert into t2 values (255), (254), (253), (252);
 select * from t2;
 a
@@ -78,8 +78,8 @@ t3	CREATE TABLE `t3` (
   `a` tinyint(4) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 7 */
+PARTITIONS 7
 insert into t3 values (127), (126), (125), (124), (-128), (-127), (1), (-1), (0);
 select * from t3;
 a
@@ -119,11 +119,11 @@ t1	CREATE TABLE `t1` (
   `a` smallint(5) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB)
 insert into t1 values (65535), (65534), (65533), (65532), (1), (2), (256);
 select * from t1;
 a
@@ -155,8 +155,8 @@ t2	CREATE TABLE `t2` (
   `a` smallint(5) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 8 */
+PARTITIONS 8
 insert into t2 values (65535), (65534), (65533), (65532);
 select * from t2;
 a
@@ -187,8 +187,8 @@ t3	CREATE TABLE `t3` (
   `a` smallint(6) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 7 */
+PARTITIONS 7
 insert into t3 values (32767), (32766), (32765), (32764), (-32768), (-32767), (1), (-1), (0);
 select * from t3;
 a
@@ -228,11 +228,11 @@ t1	CREATE TABLE `t1` (
   `a` int(10) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB)
 insert into t1 values (4294967295), (4294967294), (4294967293), (4294967292), (1), (2), (65535);
 select * from t1;
 a
@@ -264,8 +264,8 @@ t2	CREATE TABLE `t2` (
   `a` int(10) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 8 */
+PARTITIONS 8
 insert into t2 values (4294967295), (4294967294), (4294967293), (4294967292);
 select * from t2;
 a
@@ -296,8 +296,8 @@ t3	CREATE TABLE `t3` (
   `a` int(11) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 7 */
+PARTITIONS 7
 insert into t3 values (2147483647), (2147483646), (2147483645), (2147483644), (-2147483648), (-2147483647), (1), (-1), (0);
 select * from t3;
 a
@@ -337,11 +337,11 @@ t1	CREATE TABLE `t1` (
   `a` mediumint(8) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB)
 insert into t1 values (16777215), (16777214), (16777213), (16777212), (1), (2), (65535);
 select * from t1;
 a
@@ -373,8 +373,8 @@ t2	CREATE TABLE `t2` (
   `a` mediumint(8) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 8 */
+PARTITIONS 8
 insert into t2 values (16777215), (16777214), (16777213), (16777212);
 select * from t2;
 a
@@ -405,8 +405,8 @@ t3	CREATE TABLE `t3` (
   `a` mediumint(9) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 7 */
+PARTITIONS 7
 insert into t3 values (8388607), (8388606), (8388605), (8388604), (-8388608), (-8388607), (1), (-1), (0);
 select * from t3;
 a
@@ -446,11 +446,11 @@ t1	CREATE TABLE `t1` (
   `a` bigint(20) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = InnoDB,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = InnoDB,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = InnoDB,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = InnoDB)
 insert into t1 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE), (18446744073709551613), (18446744073709551612), (1), (2), (65535);
 select * from t1;
 a
@@ -494,8 +494,8 @@ t2	CREATE TABLE `t2` (
   `a` bigint(20) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 8 */
+PARTITIONS 8
 insert into t2 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE), (18446744073709551613), (18446744073709551612);
 select * from t2;
 a
@@ -526,8 +526,8 @@ t3	CREATE TABLE `t3` (
   `a` bigint(20) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 7 */
+PARTITIONS 7
 insert into t3 values (9223372036854775807), (9223372036854775806), (9223372036854775805), (9223372036854775804), (-9223372036854775808), (-9223372036854775807), (1), (-1), (0);
 select * from t3;
 a

mysql-test/suite/parts/r/partition_int_myisam.result

@@ -10,11 +10,11 @@ t1	CREATE TABLE `t1` (
   `a` tinyint(3) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM)
 insert into t1 values (255), (254), (253), (252), (1), (2), (128);
 select * from t1;
 a
@@ -46,8 +46,8 @@ t2	CREATE TABLE `t2` (
   `a` tinyint(3) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 8 */
+PARTITIONS 8
 insert into t2 values (255), (254), (253), (252);
 select * from t2;
 a
@@ -78,8 +78,8 @@ t3	CREATE TABLE `t3` (
   `a` tinyint(4) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 7 */
+PARTITIONS 7
 insert into t3 values (127), (126), (125), (124), (-128), (-127), (1), (-1), (0);
 select * from t3;
 a
@@ -119,11 +119,11 @@ t1	CREATE TABLE `t1` (
   `a` smallint(5) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM)
 insert into t1 values (65535), (65534), (65533), (65532), (1), (2), (256);
 select * from t1;
 a
@@ -155,8 +155,8 @@ t2	CREATE TABLE `t2` (
   `a` smallint(5) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 8 */
+PARTITIONS 8
 insert into t2 values (65535), (65534), (65533), (65532);
 select * from t2;
 a
@@ -187,8 +187,8 @@ t3	CREATE TABLE `t3` (
   `a` smallint(6) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 7 */
+PARTITIONS 7
 insert into t3 values (32767), (32766), (32765), (32764), (-32768), (-32767), (1), (-1), (0);
 select * from t3;
 a
@@ -228,11 +228,11 @@ t1	CREATE TABLE `t1` (
   `a` int(10) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM)
 insert into t1 values (4294967295), (4294967294), (4294967293), (4294967292), (1), (2), (65535);
 select * from t1;
 a
@@ -264,8 +264,8 @@ t2	CREATE TABLE `t2` (
   `a` int(10) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 8 */
+PARTITIONS 8
 insert into t2 values (4294967295), (4294967294), (4294967293), (4294967292);
 select * from t2;
 a
@@ -296,8 +296,8 @@ t3	CREATE TABLE `t3` (
   `a` int(11) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 7 */
+PARTITIONS 7
 insert into t3 values (2147483647), (2147483646), (2147483645), (2147483644), (-2147483648), (-2147483647), (1), (-1), (0);
 select * from t3;
 a
@@ -337,11 +337,11 @@ t1	CREATE TABLE `t1` (
   `a` mediumint(8) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM)
 insert into t1 values (16777215), (16777214), (16777213), (16777212), (1), (2), (65535);
 select * from t1;
 a
@@ -373,8 +373,8 @@ t2	CREATE TABLE `t2` (
   `a` mediumint(8) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 8 */
+PARTITIONS 8
 insert into t2 values (16777215), (16777214), (16777213), (16777212);
 select * from t2;
 a
@@ -405,8 +405,8 @@ t3	CREATE TABLE `t3` (
   `a` mediumint(9) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 7 */
+PARTITIONS 7
 insert into t3 values (8388607), (8388606), (8388605), (8388604), (-8388608), (-8388607), (1), (-1), (0);
 select * from t3;
 a
@@ -446,11 +446,11 @@ t1	CREATE TABLE `t1` (
   `a` bigint(20) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION pa1 MAX_ROWS = 20 MIN_ROWS = 2 ENGINE = MyISAM,
  PARTITION pa2 MAX_ROWS = 30 MIN_ROWS = 3 ENGINE = MyISAM,
  PARTITION pa3 MAX_ROWS = 30 MIN_ROWS = 4 ENGINE = MyISAM,
- PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM) */
+ PARTITION pa4 MAX_ROWS = 40 MIN_ROWS = 2 ENGINE = MyISAM)
 insert into t1 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE), (18446744073709551613), (18446744073709551612), (1), (2), (65535);
 select * from t1;
 a
@@ -494,8 +494,8 @@ t2	CREATE TABLE `t2` (
   `a` bigint(20) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 8 */
+PARTITIONS 8
 insert into t2 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE), (18446744073709551613), (18446744073709551612);
 select * from t2;
 a
@@ -526,8 +526,8 @@ t3	CREATE TABLE `t3` (
   `a` bigint(20) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
-PARTITIONS 7 */
+PARTITIONS 7
 insert into t3 values (9223372036854775807), (9223372036854775806), (9223372036854775805), (9223372036854775804), (-9223372036854775808), (-9223372036854775807), (1), (-1), (0);
 select * from t3;
 a

mysql-test/suite/parts/r/partition_mgm_lc0_archive.result

@@ -56,14 +56,14 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION parta ENGINE = ARCHIVE,
  PARTITION partB ENGINE = ARCHIVE,
  PARTITION Partc ENGINE = ARCHIVE,
  PARTITION PartD ENGINE = ARCHIVE,
  PARTITION partE ENGINE = ARCHIVE,
  PARTITION Partf ENGINE = ARCHIVE,
- PARTITION PartG ENGINE = ARCHIVE) */
+ PARTITION PartG ENGINE = ARCHIVE)
 ALTER TABLE TableA COALESCE PARTITION 4;
 SELECT * FROM TableA;
 a
@@ -84,10 +84,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION parta ENGINE = ARCHIVE,
  PARTITION partB ENGINE = ARCHIVE,
- PARTITION Partc ENGINE = ARCHIVE) */
+ PARTITION Partc ENGINE = ARCHIVE)
 # Test of EXCHANGE PARTITION WITH TABLE
 SELECT PARTITION_NAME, TABLE_ROWS FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_SCHEMA ='MySQL_Test_DB' AND TABLE_NAME = 'TableA';
 PARTITION_NAME	TABLE_ROWS
@@ -112,10 +112,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION parta ENGINE = ARCHIVE,
  PARTITION partB ENGINE = ARCHIVE,
- PARTITION Partc ENGINE = ARCHIVE) */
+ PARTITION Partc ENGINE = ARCHIVE)
 SELECT * FROM TableB;
 a
 10
@@ -156,10 +156,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION parta ENGINE = ARCHIVE,
  PARTITION partB ENGINE = ARCHIVE,
- PARTITION Partc ENGINE = ARCHIVE) */
+ PARTITION Partc ENGINE = ARCHIVE)
 # Test of REORGANIZE PARTITIONS
 # Should not work on HASH/KEY
 ALTER TABLE TableA REORGANIZE PARTITION parta,partB,Partc INTO
@@ -192,10 +192,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = ARCHIVE,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = ARCHIVE,
- PARTITION Partc ENGINE = ARCHIVE) */
+ PARTITION Partc ENGINE = ARCHIVE)
 # Test of RENAME TABLE
 RENAME TABLE TableA to TableB;
 SELECT * FROM TableB;
@@ -271,11 +271,11 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION parta ENGINE = ARCHIVE,
  PARTITION partB ENGINE = ARCHIVE,
  PARTITION Partc ENGINE = ARCHIVE,
- PARTITION PartD ENGINE = ARCHIVE) */
+ PARTITION PartD ENGINE = ARCHIVE)
 DROP TABLE tablea;
 # Test of REMOVE PARTITIONING
 ALTER TABLE TableA REMOVE PARTITIONING;
@@ -364,14 +364,14 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
 (PARTITION parta ENGINE = ARCHIVE,
  PARTITION partB ENGINE = ARCHIVE,
  PARTITION Partc ENGINE = ARCHIVE,
  PARTITION PartD ENGINE = ARCHIVE,
  PARTITION partE ENGINE = ARCHIVE,
  PARTITION Partf ENGINE = ARCHIVE,
- PARTITION PartG ENGINE = ARCHIVE) */
+ PARTITION PartG ENGINE = ARCHIVE)
 ALTER TABLE TableA COALESCE PARTITION 4;
 SELECT * FROM TableA;
 a
@@ -392,10 +392,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
 (PARTITION parta ENGINE = ARCHIVE,
  PARTITION partB ENGINE = ARCHIVE,
- PARTITION Partc ENGINE = ARCHIVE) */
+ PARTITION Partc ENGINE = ARCHIVE)
 # Test of REORGANIZE PARTITIONS
 # Should not work on HASH/KEY
 ALTER TABLE TableA REORGANIZE PARTITION parta,partB,Partc INTO
@@ -428,10 +428,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = ARCHIVE,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = ARCHIVE,
- PARTITION Partc ENGINE = ARCHIVE) */
+ PARTITION Partc ENGINE = ARCHIVE)
 # Test of RENAME TABLE
 RENAME TABLE TableA to TableB;
 SELECT * FROM TableB;
@@ -507,11 +507,11 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
 (PARTITION parta ENGINE = ARCHIVE,
  PARTITION partB ENGINE = ARCHIVE,
  PARTITION Partc ENGINE = ARCHIVE,
- PARTITION PartD ENGINE = ARCHIVE) */
+ PARTITION PartD ENGINE = ARCHIVE)
 DROP TABLE tablea;
 # Test of REMOVE PARTITIONING
 ALTER TABLE TableA REMOVE PARTITIONING;
@@ -589,14 +589,14 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION parta VALUES LESS THAN (4) ENGINE = ARCHIVE,
  PARTITION partB VALUES LESS THAN (7) ENGINE = ARCHIVE,
  PARTITION Partc VALUES LESS THAN (10) ENGINE = ARCHIVE,
  PARTITION PartD VALUES LESS THAN (13) ENGINE = ARCHIVE,
  PARTITION partE VALUES LESS THAN (16) ENGINE = ARCHIVE,
  PARTITION Partf VALUES LESS THAN (19) ENGINE = ARCHIVE,
- PARTITION PartG VALUES LESS THAN (22) ENGINE = ARCHIVE) */
+ PARTITION PartG VALUES LESS THAN (22) ENGINE = ARCHIVE)
 ALTER TABLE TableA DROP PARTITION partE, PartG;
 ALTER TABLE TableA DROP PARTITION Partf;
 ALTER TABLE TableA ADD PARTITION
@@ -620,12 +620,12 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION parta VALUES LESS THAN (4) ENGINE = ARCHIVE,
  PARTITION partB VALUES LESS THAN (7) ENGINE = ARCHIVE,
  PARTITION Partc VALUES LESS THAN (10) ENGINE = ARCHIVE,
  PARTITION PartD VALUES LESS THAN (13) ENGINE = ARCHIVE,
- PARTITION PartE VALUES LESS THAN MAXVALUE ENGINE = ARCHIVE) */
+ PARTITION PartE VALUES LESS THAN MAXVALUE ENGINE = ARCHIVE)
 # Test of REORGANIZE PARTITIONS
 # Error since it must reorganize a consecutive range
 ALTER TABLE TableA REORGANIZE PARTITION parta,Partc INTO
@@ -658,11 +658,11 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION parta VALUES LESS THAN (4) ENGINE = ARCHIVE,
  PARTITION partD VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = ARCHIVE,
  PARTITION partB VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = ARCHIVE,
- PARTITION partC VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = ARCHIVE) */
+ PARTITION partC VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = ARCHIVE)
 # Test of RENAME TABLE
 RENAME TABLE TableA to TableB;
 SELECT * FROM TableB;
@@ -738,11 +738,11 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION parta VALUES LESS THAN (4) ENGINE = ARCHIVE,
  PARTITION partB VALUES LESS THAN (7) ENGINE = ARCHIVE,
  PARTITION Partc VALUES LESS THAN (10) ENGINE = ARCHIVE,
- PARTITION PartD VALUES LESS THAN (13) ENGINE = ARCHIVE) */
+ PARTITION PartD VALUES LESS THAN (13) ENGINE = ARCHIVE)
 DROP TABLE tablea;
 # Test of REMOVE PARTITIONING
 ALTER TABLE TableA REMOVE PARTITIONING;
@@ -820,14 +820,14 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 (PARTITION parta VALUES IN (1,8,9) ENGINE = ARCHIVE,
  PARTITION partB VALUES IN (2,10,11) ENGINE = ARCHIVE,
  PARTITION Partc VALUES IN (3,4,7) ENGINE = ARCHIVE,
  PARTITION PartD VALUES IN (5,6,12) ENGINE = ARCHIVE,
  PARTITION partE VALUES IN (16) ENGINE = ARCHIVE,
  PARTITION Partf VALUES IN (19) ENGINE = ARCHIVE,
- PARTITION PartG VALUES IN (22) ENGINE = ARCHIVE) */
+ PARTITION PartG VALUES IN (22) ENGINE = ARCHIVE)
 ALTER TABLE TableA DROP PARTITION partE, PartG;
 ALTER TABLE TableA DROP PARTITION Partf;
 ALTER TABLE TableA ADD PARTITION
@@ -851,12 +851,12 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 (PARTITION parta VALUES IN (1,8,9) ENGINE = ARCHIVE,
  PARTITION partB VALUES IN (2,10,11) ENGINE = ARCHIVE,
  PARTITION Partc VALUES IN (3,4,7) ENGINE = ARCHIVE,
  PARTITION PartD VALUES IN (5,6,12) ENGINE = ARCHIVE,
- PARTITION PartE VALUES IN (13) ENGINE = ARCHIVE) */
+ PARTITION PartE VALUES IN (13) ENGINE = ARCHIVE)
 # Test of REORGANIZE PARTITIONS
 ALTER TABLE TableA REORGANIZE PARTITION parta,Partc INTO
 (PARTITION Partc VALUES IN (1,7) 
@@ -889,12 +889,12 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 (PARTITION Partc VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = ARCHIVE,
  PARTITION parta VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = ARCHIVE,
  PARTITION partB VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = ARCHIVE,
  PARTITION PartD VALUES IN (5,6,12) ENGINE = ARCHIVE,
- PARTITION PartE VALUES IN (13) ENGINE = ARCHIVE) */
+ PARTITION PartE VALUES IN (13) ENGINE = ARCHIVE)
 # Test of RENAME TABLE
 RENAME TABLE TableA to TableB;
 SELECT * FROM TableB;
@@ -961,11 +961,11 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 (PARTITION parta VALUES IN (1,8,9) ENGINE = ARCHIVE,
  PARTITION partB VALUES IN (2,10,11) ENGINE = ARCHIVE,
  PARTITION Partc VALUES IN (3,4,7) ENGINE = ARCHIVE,
- PARTITION PartD VALUES IN (5,6,12) ENGINE = ARCHIVE) */
+ PARTITION PartD VALUES IN (5,6,12) ENGINE = ARCHIVE)
 DROP TABLE tablea;
 # Test of REMOVE PARTITIONING
 ALTER TABLE TableA REMOVE PARTITIONING;

mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result

@@ -56,14 +56,14 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION parta ENGINE = InnoDB,
  PARTITION partB ENGINE = InnoDB,
  PARTITION Partc ENGINE = InnoDB,
  PARTITION PartD ENGINE = InnoDB,
  PARTITION partE ENGINE = InnoDB,
  PARTITION Partf ENGINE = InnoDB,
- PARTITION PartG ENGINE = InnoDB) */
+ PARTITION PartG ENGINE = InnoDB)
 ALTER TABLE TableA COALESCE PARTITION 4;
 SELECT * FROM TableA;
 a
@@ -84,10 +84,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION parta ENGINE = InnoDB,
  PARTITION partB ENGINE = InnoDB,
- PARTITION Partc ENGINE = InnoDB) */
+ PARTITION Partc ENGINE = InnoDB)
 # Test of EXCHANGE PARTITION WITH TABLE
 SELECT PARTITION_NAME, TABLE_ROWS FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_SCHEMA ='MySQL_Test_DB' AND TABLE_NAME = 'TableA';
 PARTITION_NAME	TABLE_ROWS
@@ -112,10 +112,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION parta ENGINE = InnoDB,
  PARTITION partB ENGINE = InnoDB,
- PARTITION Partc ENGINE = InnoDB) */
+ PARTITION Partc ENGINE = InnoDB)
 SELECT * FROM TableB;
 a
 10
@@ -156,10 +156,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION parta ENGINE = InnoDB,
  PARTITION partB ENGINE = InnoDB,
- PARTITION Partc ENGINE = InnoDB) */
+ PARTITION Partc ENGINE = InnoDB)
 # Test of REORGANIZE PARTITIONS
 # Should not work on HASH/KEY
 ALTER TABLE TableA REORGANIZE PARTITION parta,partB,Partc INTO
@@ -192,10 +192,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = InnoDB,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = InnoDB,
- PARTITION Partc ENGINE = InnoDB) */
+ PARTITION Partc ENGINE = InnoDB)
 # Test of RENAME TABLE
 RENAME TABLE TableA to TableB;
 SELECT * FROM TableB;
@@ -271,11 +271,11 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY (a)
+ PARTITION BY KEY (a)
 (PARTITION parta ENGINE = InnoDB,
  PARTITION partB ENGINE = InnoDB,
  PARTITION Partc ENGINE = InnoDB,
- PARTITION PartD ENGINE = InnoDB) */
+ PARTITION PartD ENGINE = InnoDB)
 DROP TABLE tablea;
 # Test of REMOVE PARTITIONING
 ALTER TABLE TableA REMOVE PARTITIONING;
@@ -364,14 +364,14 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
 (PARTITION parta ENGINE = InnoDB,
  PARTITION partB ENGINE = InnoDB,
  PARTITION Partc ENGINE = InnoDB,
  PARTITION PartD ENGINE = InnoDB,
  PARTITION partE ENGINE = InnoDB,
  PARTITION Partf ENGINE = InnoDB,
- PARTITION PartG ENGINE = InnoDB) */
+ PARTITION PartG ENGINE = InnoDB)
 ALTER TABLE TableA COALESCE PARTITION 4;
 SELECT * FROM TableA;
 a
@@ -392,10 +392,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
 (PARTITION parta ENGINE = InnoDB,
  PARTITION partB ENGINE = InnoDB,
- PARTITION Partc ENGINE = InnoDB) */
+ PARTITION Partc ENGINE = InnoDB)
 # Test of REORGANIZE PARTITIONS
 # Should not work on HASH/KEY
 ALTER TABLE TableA REORGANIZE PARTITION parta,partB,Partc INTO
@@ -428,10 +428,10 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = InnoDB,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = InnoDB,
- PARTITION Partc ENGINE = InnoDB) */
+ PARTITION Partc ENGINE = InnoDB)
 # Test of RENAME TABLE
 RENAME TABLE TableA to TableB;
 SELECT * FROM TableB;
@@ -507,11 +507,11 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY HASH (a)
+ PARTITION BY HASH (a)
 (PARTITION parta ENGINE = InnoDB,
  PARTITION partB ENGINE = InnoDB,
  PARTITION Partc ENGINE = InnoDB,
- PARTITION PartD ENGINE = InnoDB) */
+ PARTITION PartD ENGINE = InnoDB)
 DROP TABLE tablea;
 # Test of REMOVE PARTITIONING
 ALTER TABLE TableA REMOVE PARTITIONING;
@@ -589,14 +589,14 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION parta VALUES LESS THAN (4) ENGINE = InnoDB,
  PARTITION partB VALUES LESS THAN (7) ENGINE = InnoDB,
  PARTITION Partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION PartD VALUES LESS THAN (13) ENGINE = InnoDB,
  PARTITION partE VALUES LESS THAN (16) ENGINE = InnoDB,
  PARTITION Partf VALUES LESS THAN (19) ENGINE = InnoDB,
- PARTITION PartG VALUES LESS THAN (22) ENGINE = InnoDB) */
+ PARTITION PartG VALUES LESS THAN (22) ENGINE = InnoDB)
 ALTER TABLE TableA DROP PARTITION partE, PartG;
 ALTER TABLE TableA DROP PARTITION Partf;
 ALTER TABLE TableA ADD PARTITION
@@ -620,12 +620,12 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION parta VALUES LESS THAN (4) ENGINE = InnoDB,
  PARTITION partB VALUES LESS THAN (7) ENGINE = InnoDB,
  PARTITION Partc VALUES LESS THAN (10) ENGINE = InnoDB,
  PARTITION PartD VALUES LESS THAN (13) ENGINE = InnoDB,
- PARTITION PartE VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
+ PARTITION PartE VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
 # Test of REORGANIZE PARTITIONS
 # Error since it must reorganize a consecutive range
 ALTER TABLE TableA REORGANIZE PARTITION parta,Partc INTO
@@ -658,11 +658,11 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION parta VALUES LESS THAN (4) ENGINE = InnoDB,
  PARTITION partD VALUES LESS THAN (8) COMMENT = 'Previously partB and partly Partc' ENGINE = InnoDB,
  PARTITION partB VALUES LESS THAN (11) COMMENT = 'Previously partly Partc and partly PartD' ENGINE = InnoDB,
- PARTITION partC VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = InnoDB) */
+ PARTITION partC VALUES LESS THAN MAXVALUE COMMENT = 'Previously partly PartD' ENGINE = InnoDB)
 # Test of RENAME TABLE
 RENAME TABLE TableA to TableB;
 SELECT * FROM TableB;
@@ -738,11 +738,11 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION parta VALUES LESS THAN (4) ENGINE = InnoDB,
  PARTITION partB VALUES LESS THAN (7) ENGINE = InnoDB,
  PARTITION Partc VALUES LESS THAN (10) ENGINE = InnoDB,
- PARTITION PartD VALUES LESS THAN (13) ENGINE = InnoDB) */
+ PARTITION PartD VALUES LESS THAN (13) ENGINE = InnoDB)
 DROP TABLE tablea;
 # Test of REMOVE PARTITIONING
 ALTER TABLE TableA REMOVE PARTITIONING;
@@ -820,14 +820,14 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 (PARTITION parta VALUES IN (1,8,9) ENGINE = InnoDB,
  PARTITION partB VALUES IN (2,10,11) ENGINE = InnoDB,
  PARTITION Partc VALUES IN (3,4,7) ENGINE = InnoDB,
  PARTITION PartD VALUES IN (5,6,12) ENGINE = InnoDB,
  PARTITION partE VALUES IN (16) ENGINE = InnoDB,
  PARTITION Partf VALUES IN (19) ENGINE = InnoDB,
- PARTITION PartG VALUES IN (22) ENGINE = InnoDB) */
+ PARTITION PartG VALUES IN (22) ENGINE = InnoDB)
 ALTER TABLE TableA DROP PARTITION partE, PartG;
 ALTER TABLE TableA DROP PARTITION Partf;
 ALTER TABLE TableA ADD PARTITION
@@ -851,12 +851,12 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 (PARTITION parta VALUES IN (1,8,9) ENGINE = InnoDB,
  PARTITION partB VALUES IN (2,10,11) ENGINE = InnoDB,
  PARTITION Partc VALUES IN (3,4,7) ENGINE = InnoDB,
  PARTITION PartD VALUES IN (5,6,12) ENGINE = InnoDB,
- PARTITION PartE VALUES IN (13) ENGINE = InnoDB) */
+ PARTITION PartE VALUES IN (13) ENGINE = InnoDB)
 # Test of REORGANIZE PARTITIONS
 ALTER TABLE TableA REORGANIZE PARTITION parta,Partc INTO
 (PARTITION Partc VALUES IN (1,7) 
@@ -889,12 +889,12 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 (PARTITION Partc VALUES IN (1,7) COMMENT = 'Mix 1 of old parta and Partc' ENGINE = InnoDB,
  PARTITION parta VALUES IN (3,9) COMMENT = 'Mix 2 of old parta and Partc' ENGINE = InnoDB,
  PARTITION partB VALUES IN (4,8) COMMENT = 'Mix 3 of old parta and Partc' ENGINE = InnoDB,
  PARTITION PartD VALUES IN (5,6,12) ENGINE = InnoDB,
- PARTITION PartE VALUES IN (13) ENGINE = InnoDB) */
+ PARTITION PartE VALUES IN (13) ENGINE = InnoDB)
 # Test of RENAME TABLE
 RENAME TABLE TableA to TableB;
 SELECT * FROM TableB;
@@ -961,11 +961,11 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LIST (a)
+ PARTITION BY LIST (a)
 (PARTITION parta VALUES IN (1,8,9) ENGINE = InnoDB,
  PARTITION partB VALUES IN (2,10,11) ENGINE = InnoDB,
  PARTITION Partc VALUES IN (3,4,7) ENGINE = InnoDB,
- PARTITION PartD VALUES IN (5,6,12) ENGINE = InnoDB) */
+ PARTITION PartD VALUES IN (5,6,12) ENGINE = InnoDB)
 DROP TABLE tablea;
 # Test of REMOVE PARTITIONING
 ALTER TABLE TableA REMOVE PARTITIONING;
@@ -1004,10 +1004,10 @@ t1	CREATE TABLE `t1` (
   `b` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB AUTO_INCREMENT=2002 DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY RANGE (a)
+ PARTITION BY RANGE (a)
 (PARTITION LT1000 VALUES LESS THAN (1000) ENGINE = InnoDB,
  PARTITION LT2000 VALUES LESS THAN (2000) ENGINE = InnoDB,
- PARTITION MAX VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
+ PARTITION MAX VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
 SELECT * FROM t1 ORDER BY a;
 a	b
 1	First