Bug#16274455: CAN NOT ACESS PARTITIONED TABLES WHEN

DOWNGRADED FROM 5.6.11 TO 5.6.10

Problem was new syntax not accepted by previous version.

Fixed by adding version comment of /*!50531 around the
new syntax.

Like this in the .frm file:
'PARTITION BY KEY /*!50611 ALGORITHM = 2 */ () PARTITIONS 3'
and also changing the output from SHOW CREATE TABLE to:
CREATE TABLE t1 (a INT)
/*!50100 PARTITION BY KEY */ /*!50611 ALGORITHM = 1 */ /*!50100 ()
PARTITIONS 3 */

It will always add the ALGORITHM into the .frm for KEY [sub]partitioned
tables, but for SHOW CREATE TABLE it will only add it in case it is the non
default ALGORITHM = 1.

Also notice that for 5.5, it will say /*!50531 instead of /*!50611, which
will make upgrade from 5.5 > 5.5.31 to 5.6 < 5.6.11 fail!
If one downgrades an fixed version to the same major version (5.5 or 5.6) the
bug 14521864 will be visible again, but unless the .frm is updated, it will
work again when upgrading again.

Also fixed so that the .frm does not get updated version
if a single partition check passes.

45 files changed, 568 insertions, 568 deletions

diff --git a/mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result b/mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result
index 94194cd6ce6..3ef62f2b050 100644
--- a/mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result
+++ b/mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result
@@ -567,7 +567,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -2575,7 +2575,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -3593,7 +3593,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -4581,7 +4581,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -6589,7 +6589,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -7607,7 +7607,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -8612,7 +8612,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -10684,7 +10684,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -11734,7 +11734,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -12754,7 +12754,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -14826,7 +14826,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -15876,7 +15876,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -16883,7 +16883,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -18895,7 +18895,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -19915,7 +19915,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -20905,7 +20905,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -22917,7 +22917,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -23937,7 +23937,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -24927,7 +24927,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -26939,7 +26939,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -27959,7 +27959,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
diff --git a/mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result b/mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
index 1d264febcf5..887ac403cdb 100644
--- a/mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
@@ -592,7 +592,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 unified filelist
@@ -2738,7 +2738,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -3830,7 +3830,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
@@ -4882,7 +4882,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 unified filelist
@@ -7028,7 +7028,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -8120,7 +8120,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
diff --git a/mysql-test/suite/parts/r/partition_alter1_1_innodb.result b/mysql-test/suite/parts/r/partition_alter1_1_innodb.result
index d7d9e5b4356..66d84768b5e 100644
--- a/mysql-test/suite/parts/r/partition_alter1_1_innodb.result
+++ b/mysql-test/suite/parts/r/partition_alter1_1_innodb.result
@@ -885,7 +885,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 KEY ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -2895,7 +2895,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -3913,7 +3913,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -4901,7 +4901,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 KEY ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -6911,7 +6911,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -7929,7 +7929,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -8934,7 +8934,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 KEY ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -11008,7 +11008,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -12058,7 +12058,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -13078,7 +13078,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 KEY ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -15152,7 +15152,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -16202,7 +16202,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
diff --git a/mysql-test/suite/parts/r/partition_alter1_1_myisam.result b/mysql-test/suite/parts/r/partition_alter1_1_myisam.result
index 4030d09981a..9f616d04df3 100644
--- a/mysql-test/suite/parts/r/partition_alter1_1_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter1_1_myisam.result
@@ -751,7 +751,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 KEY ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 unified filelist
@@ -2899,7 +2899,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -3991,7 +3991,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
@@ -5043,7 +5043,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 KEY ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 unified filelist
@@ -7191,7 +7191,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -8283,7 +8283,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
diff --git a/mysql-test/suite/parts/r/partition_alter1_2_innodb.result b/mysql-test/suite/parts/r/partition_alter1_2_innodb.result
index f0d69fc4c41..f1a1aeecb66 100644
--- a/mysql-test/suite/parts/r/partition_alter1_2_innodb.result
+++ b/mysql-test/suite/parts/r/partition_alter1_2_innodb.result
@@ -513,7 +513,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -2315,7 +2315,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -3229,7 +3229,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -4113,7 +4113,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -5915,7 +5915,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -6829,7 +6829,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -7729,7 +7729,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -9595,7 +9595,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -10541,7 +10541,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -11445,7 +11445,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 ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -13245,7 +13245,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -14159,7 +14159,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -15043,7 +15043,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 ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -16843,7 +16843,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -17757,7 +17757,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -18658,7 +18658,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 ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -20522,7 +20522,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -21468,7 +21468,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -22384,7 +22384,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 ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -24248,7 +24248,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -25194,7 +25194,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -26095,7 +26095,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 ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -27895,7 +27895,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -28809,7 +28809,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -29693,7 +29693,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 ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -31493,7 +31493,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -32407,7 +32407,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -33307,7 +33307,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 ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -35171,7 +35171,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -36117,7 +36117,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
diff --git a/mysql-test/suite/parts/r/partition_alter1_2_myisam.result b/mysql-test/suite/parts/r/partition_alter1_2_myisam.result
index 06dd211706c..087262f5f89 100644
--- a/mysql-test/suite/parts/r/partition_alter1_2_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter1_2_myisam.result
@@ -537,7 +537,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 unified filelist
@@ -2477,7 +2477,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -3465,7 +3465,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
@@ -4417,7 +4417,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 ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 unified filelist
@@ -6355,7 +6355,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -7343,7 +7343,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
@@ -8291,7 +8291,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 ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 unified filelist
@@ -10229,7 +10229,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -11217,7 +11217,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
@@ -12165,7 +12165,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 ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 unified filelist
@@ -14103,7 +14103,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -15091,7 +15091,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
diff --git a/mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result b/mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result
index d687f58eca2..314044044bb 100644
--- a/mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result
+++ b/mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result
@@ -530,7 +530,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -2396,7 +2396,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -3342,7 +3342,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -4296,7 +4296,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 KEY ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -6306,7 +6306,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -7324,7 +7324,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -8312,7 +8312,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 KEY ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -10322,7 +10322,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -11340,7 +11340,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -12345,7 +12345,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 KEY ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -14419,7 +14419,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -15469,7 +15469,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -16489,7 +16489,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 KEY ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -18563,7 +18563,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -19613,7 +19613,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
diff --git a/mysql-test/suite/parts/r/partition_alter2_1_2_innodb.result b/mysql-test/suite/parts/r/partition_alter2_1_2_innodb.result
index 782ae78b13a..e824cf45ce9 100644
--- a/mysql-test/suite/parts/r/partition_alter2_1_2_innodb.result
+++ b/mysql-test/suite/parts/r/partition_alter2_1_2_innodb.result
@@ -526,7 +526,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 ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -2390,7 +2390,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -3336,7 +3336,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -4290,7 +4290,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -6298,7 +6298,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -7316,7 +7316,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -8304,7 +8304,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -10312,7 +10312,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -11330,7 +11330,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -12335,7 +12335,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -14407,7 +14407,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -15457,7 +15457,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -16477,7 +16477,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -18549,7 +18549,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -19599,7 +19599,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
diff --git a/mysql-test/suite/parts/r/partition_alter2_1_myisam.result b/mysql-test/suite/parts/r/partition_alter2_1_myisam.result
index 0abb1631d1f..f2a13497159 100644
--- a/mysql-test/suite/parts/r/partition_alter2_1_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter2_1_myisam.result
@@ -539,7 +539,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 unified filelist
@@ -2479,7 +2479,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -3467,7 +3467,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
@@ -4469,7 +4469,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 KEY ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 unified filelist
@@ -6617,7 +6617,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -7709,7 +7709,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
@@ -8761,7 +8761,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 KEY ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 unified filelist
@@ -10909,7 +10909,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -12001,7 +12001,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
@@ -13005,7 +13005,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 ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 unified filelist
@@ -14943,7 +14943,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -15931,7 +15931,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
@@ -16933,7 +16933,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 unified filelist
@@ -19079,7 +19079,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -20171,7 +20171,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
@@ -21223,7 +21223,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 unified filelist
@@ -23369,7 +23369,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -24461,7 +24461,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
diff --git a/mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result b/mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result
index e2c6cd53c5b..faba21b41f7 100644
--- a/mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result
+++ b/mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result
@@ -532,7 +532,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -2404,7 +2404,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -3352,7 +3352,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -4309,7 +4309,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 KEY ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -6325,7 +6325,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -7345,7 +7345,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -8337,7 +8337,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 KEY ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -10353,7 +10353,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -11373,7 +11373,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -12382,7 +12382,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 KEY ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -14462,7 +14462,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -15514,7 +15514,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -16538,7 +16538,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 KEY ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -18618,7 +18618,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -19670,7 +19670,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
diff --git a/mysql-test/suite/parts/r/partition_alter2_2_2_innodb.result b/mysql-test/suite/parts/r/partition_alter2_2_2_innodb.result
index e96b2caa33b..2557cd5a219 100644
--- a/mysql-test/suite/parts/r/partition_alter2_2_2_innodb.result
+++ b/mysql-test/suite/parts/r/partition_alter2_2_2_innodb.result
@@ -528,7 +528,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 ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -2408,7 +2408,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -3362,7 +3362,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -4322,7 +4322,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -6346,7 +6346,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -7372,7 +7372,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -8366,7 +8366,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -10390,7 +10390,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -11416,7 +11416,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -12427,7 +12427,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -14515,7 +14515,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -15573,7 +15573,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -16599,7 +16599,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 # check prerequisites-1 success:    1
@@ -18687,7 +18687,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -19745,7 +19745,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
diff --git a/mysql-test/suite/parts/r/partition_alter2_2_myisam.result b/mysql-test/suite/parts/r/partition_alter2_2_myisam.result
index 69bcdc29e30..70e869f48fb 100644
--- a/mysql-test/suite/parts/r/partition_alter2_2_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter2_2_myisam.result
@@ -541,7 +541,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 unified filelist
@@ -2487,7 +2487,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -3477,7 +3477,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
@@ -4483,7 +4483,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 KEY ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 unified filelist
@@ -6637,7 +6637,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -7731,7 +7731,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
@@ -8787,7 +8787,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 KEY ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 unified filelist
@@ -10941,7 +10941,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -12035,7 +12035,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
@@ -13043,7 +13043,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 ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 unified filelist
@@ -14997,7 +14997,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -15993,7 +15993,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
@@ -17001,7 +17001,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 unified filelist
@@ -19163,7 +19163,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -20263,7 +20263,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
@@ -21321,7 +21321,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 unified filelist
@@ -23483,7 +23483,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -24583,7 +24583,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
diff --git a/mysql-test/suite/parts/r/partition_alter3_innodb.result b/mysql-test/suite/parts/r/partition_alter3_innodb.result
index 7e91ae4c7e7..7825a2350b0 100644
--- a/mysql-test/suite/parts/r/partition_alter3_innodb.result
+++ b/mysql-test/suite/parts/r/partition_alter3_innodb.result
@@ -419,7 +419,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 ALGORITHM = 2 (f_int1) */
+/*!50100 PARTITION BY KEY (f_int1) */
 t1.frm
 t1.par
 EXPLAIN PARTITIONS SELECT COUNT(*) <> 1 FROM t1 WHERE f_int1 = 3;
@@ -444,7 +444,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
  PARTITION part7 ENGINE = InnoDB) */
@@ -467,7 +467,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
  PARTITION part7 ENGINE = InnoDB,
@@ -491,7 +491,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
  PARTITION part7 ENGINE = InnoDB,
@@ -526,7 +526,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
  PARTITION part7 ENGINE = InnoDB,
@@ -552,7 +552,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
  PARTITION part7 ENGINE = InnoDB,
@@ -577,7 +577,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
  PARTITION part7 ENGINE = InnoDB,
@@ -601,7 +601,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
  PARTITION part7 ENGINE = InnoDB,
@@ -624,7 +624,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB,
  PARTITION part7 ENGINE = InnoDB) */
@@ -646,7 +646,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = InnoDB,
  PARTITION part1 ENGINE = InnoDB) */
 t1.frm
@@ -667,7 +667,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = InnoDB) */
 t1.frm
 t1.par
diff --git a/mysql-test/suite/parts/r/partition_alter3_myisam.result b/mysql-test/suite/parts/r/partition_alter3_myisam.result
index 7b681d6ffc1..a5dec48e85c 100644
--- a/mysql-test/suite/parts/r/partition_alter3_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter3_myisam.result
@@ -511,7 +511,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 ALGORITHM = 2 (f_int1) */
+/*!50100 PARTITION BY KEY (f_int1) */
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -538,7 +538,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
  PARTITION part7 ENGINE = MyISAM) */
@@ -567,7 +567,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
  PARTITION part7 ENGINE = MyISAM,
@@ -599,7 +599,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
  PARTITION part7 ENGINE = MyISAM,
@@ -650,7 +650,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
  PARTITION part7 ENGINE = MyISAM,
@@ -690,7 +690,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
  PARTITION part7 ENGINE = MyISAM,
@@ -727,7 +727,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
  PARTITION part7 ENGINE = MyISAM,
@@ -761,7 +761,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
  PARTITION part7 ENGINE = MyISAM,
@@ -792,7 +792,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM,
  PARTITION part7 ENGINE = MyISAM) */
@@ -820,7 +820,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = MyISAM,
  PARTITION part1 ENGINE = MyISAM) */
 t1#P#p0.MYD
@@ -845,7 +845,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION p0 ENGINE = MyISAM) */
 t1#P#p0.MYD
 t1#P#p0.MYI
diff --git a/mysql-test/suite/parts/r/partition_alter4_innodb.result b/mysql-test/suite/parts/r/partition_alter4_innodb.result
index 0bd17bf26e2..46f3ed3c974 100644
--- a/mysql-test/suite/parts/r/partition_alter4_innodb.result
+++ b/mysql-test/suite/parts/r/partition_alter4_innodb.result
@@ -534,7 +534,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = InnoDB,
  PARTITION part_2 ENGINE = InnoDB,
  PARTITION part_3 ENGINE = InnoDB,
@@ -2412,7 +2412,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -3362,7 +3362,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (1) ENGINE = InnoDB,
@@ -4284,7 +4284,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = InnoDB,
  PARTITION part_2 ENGINE = InnoDB,
  PARTITION part_3 ENGINE = InnoDB,
@@ -6162,7 +6162,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -7112,7 +7112,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (1) ENGINE = InnoDB,
@@ -8034,7 +8034,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = InnoDB,
  PARTITION part_2 ENGINE = InnoDB,
  PARTITION part_3 ENGINE = InnoDB,
@@ -9912,7 +9912,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -10862,7 +10862,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (1) ENGINE = InnoDB,
@@ -11784,7 +11784,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = InnoDB,
  PARTITION part_2 ENGINE = InnoDB,
  PARTITION part_3 ENGINE = InnoDB,
@@ -13662,7 +13662,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -14612,7 +14612,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (1) ENGINE = InnoDB,
@@ -15534,7 +15534,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = InnoDB,
  PARTITION part_2 ENGINE = InnoDB,
  PARTITION part_3 ENGINE = InnoDB,
@@ -17412,7 +17412,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -18362,7 +18362,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (1) ENGINE = InnoDB,
@@ -19287,7 +19287,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = InnoDB,
  PARTITION part_2 ENGINE = InnoDB,
  PARTITION part_3 ENGINE = InnoDB,
@@ -21165,7 +21165,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -22115,7 +22115,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (1) ENGINE = InnoDB,
@@ -23037,7 +23037,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = InnoDB,
  PARTITION part_2 ENGINE = InnoDB,
  PARTITION part_3 ENGINE = InnoDB,
@@ -24915,7 +24915,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -25865,7 +25865,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (1) ENGINE = InnoDB,
@@ -26787,7 +26787,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = InnoDB,
  PARTITION part_2 ENGINE = InnoDB,
  PARTITION part_3 ENGINE = InnoDB,
@@ -28665,7 +28665,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -29615,7 +29615,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (1) ENGINE = InnoDB,
@@ -30537,7 +30537,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = InnoDB,
  PARTITION part_2 ENGINE = InnoDB,
  PARTITION part_3 ENGINE = InnoDB,
@@ -32415,7 +32415,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -33365,7 +33365,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (1) ENGINE = InnoDB,
@@ -34287,7 +34287,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = InnoDB,
  PARTITION part_2 ENGINE = InnoDB,
  PARTITION part_3 ENGINE = InnoDB,
@@ -36165,7 +36165,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -37115,7 +37115,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (1) ENGINE = InnoDB,
@@ -38042,7 +38042,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = InnoDB,
  PARTITION part_2 ENGINE = InnoDB,
  PARTITION part_3 ENGINE = InnoDB,
@@ -39924,7 +39924,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -40876,7 +40876,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (1) ENGINE = InnoDB,
@@ -41800,7 +41800,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = InnoDB,
  PARTITION part_2 ENGINE = InnoDB,
  PARTITION part_3 ENGINE = InnoDB,
@@ -43682,7 +43682,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -44634,7 +44634,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (1) ENGINE = InnoDB,
@@ -45556,7 +45556,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = InnoDB,
  PARTITION part_2 ENGINE = InnoDB,
  PARTITION part_3 ENGINE = InnoDB,
@@ -47434,7 +47434,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -48384,7 +48384,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (1) ENGINE = InnoDB,
@@ -49306,7 +49306,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = InnoDB,
  PARTITION part_2 ENGINE = InnoDB,
  PARTITION part_3 ENGINE = InnoDB,
@@ -51184,7 +51184,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -52134,7 +52134,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (1) ENGINE = InnoDB,
@@ -53058,7 +53058,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = InnoDB,
  PARTITION part_2 ENGINE = InnoDB,
  PARTITION part_3 ENGINE = InnoDB,
@@ -54940,7 +54940,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -55892,7 +55892,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (1) ENGINE = InnoDB,
@@ -56813,7 +56813,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = InnoDB,
  PARTITION part_2 ENGINE = InnoDB,
  PARTITION part_3 ENGINE = InnoDB,
@@ -58683,7 +58683,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -59629,7 +59629,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (1) ENGINE = InnoDB,
@@ -60547,7 +60547,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = InnoDB,
  PARTITION part_2 ENGINE = InnoDB,
  PARTITION part_3 ENGINE = InnoDB,
@@ -62417,7 +62417,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -63363,7 +63363,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (1) ENGINE = InnoDB,
@@ -64601,7 +64601,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = InnoDB,
  PARTITION part_2 ENGINE = InnoDB,
  PARTITION part_3 ENGINE = InnoDB,
@@ -66471,7 +66471,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -67417,7 +67417,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (1) ENGINE = InnoDB,
@@ -68342,7 +68342,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = InnoDB,
  PARTITION part_2 ENGINE = InnoDB,
  PARTITION part_3 ENGINE = InnoDB,
@@ -70220,7 +70220,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -71170,7 +71170,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (1) ENGINE = InnoDB,
@@ -72092,7 +72092,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = InnoDB,
  PARTITION part_2 ENGINE = InnoDB,
  PARTITION part_3 ENGINE = InnoDB,
@@ -73970,7 +73970,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -74920,7 +74920,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (1) ENGINE = InnoDB,
@@ -75842,7 +75842,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = InnoDB,
  PARTITION part_2 ENGINE = InnoDB,
  PARTITION part_3 ENGINE = InnoDB,
@@ -77720,7 +77720,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -78670,7 +78670,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (1) ENGINE = InnoDB,
@@ -79592,7 +79592,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = InnoDB,
  PARTITION part_2 ENGINE = InnoDB,
  PARTITION part_3 ENGINE = InnoDB,
@@ -81470,7 +81470,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -82420,7 +82420,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (1) ENGINE = InnoDB,
@@ -83342,7 +83342,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = InnoDB,
  PARTITION part_2 ENGINE = InnoDB,
  PARTITION part_3 ENGINE = InnoDB,
@@ -85220,7 +85220,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -86170,7 +86170,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part_2 VALUES IN (1) ENGINE = InnoDB,
diff --git a/mysql-test/suite/parts/r/partition_alter4_myisam.result b/mysql-test/suite/parts/r/partition_alter4_myisam.result
index 49cdc22f836..c74a105306c 100644
--- a/mysql-test/suite/parts/r/partition_alter4_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter4_myisam.result
@@ -543,7 +543,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = MyISAM,
  PARTITION part_2 ENGINE = MyISAM,
  PARTITION part_3 ENGINE = MyISAM,
@@ -2495,7 +2495,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -3487,7 +3487,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (1) ENGINE = MyISAM,
@@ -4441,7 +4441,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = MyISAM,
  PARTITION part_2 ENGINE = MyISAM,
  PARTITION part_3 ENGINE = MyISAM,
@@ -6393,7 +6393,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -7385,7 +7385,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (1) ENGINE = MyISAM,
@@ -8339,7 +8339,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = MyISAM,
  PARTITION part_2 ENGINE = MyISAM,
  PARTITION part_3 ENGINE = MyISAM,
@@ -10291,7 +10291,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -11283,7 +11283,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (1) ENGINE = MyISAM,
@@ -12237,7 +12237,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = MyISAM,
  PARTITION part_2 ENGINE = MyISAM,
  PARTITION part_3 ENGINE = MyISAM,
@@ -14189,7 +14189,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -15181,7 +15181,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (1) ENGINE = MyISAM,
@@ -16135,7 +16135,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = MyISAM,
  PARTITION part_2 ENGINE = MyISAM,
  PARTITION part_3 ENGINE = MyISAM,
@@ -18087,7 +18087,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -19079,7 +19079,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (1) ENGINE = MyISAM,
@@ -20036,7 +20036,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = MyISAM,
  PARTITION part_2 ENGINE = MyISAM,
  PARTITION part_3 ENGINE = MyISAM,
@@ -21988,7 +21988,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -22980,7 +22980,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (1) ENGINE = MyISAM,
@@ -23934,7 +23934,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = MyISAM,
  PARTITION part_2 ENGINE = MyISAM,
  PARTITION part_3 ENGINE = MyISAM,
@@ -25886,7 +25886,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -26878,7 +26878,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (1) ENGINE = MyISAM,
@@ -27832,7 +27832,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = MyISAM,
  PARTITION part_2 ENGINE = MyISAM,
  PARTITION part_3 ENGINE = MyISAM,
@@ -29784,7 +29784,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -30776,7 +30776,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (1) ENGINE = MyISAM,
@@ -31730,7 +31730,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = MyISAM,
  PARTITION part_2 ENGINE = MyISAM,
  PARTITION part_3 ENGINE = MyISAM,
@@ -33682,7 +33682,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -34674,7 +34674,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (1) ENGINE = MyISAM,
@@ -35628,7 +35628,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = MyISAM,
  PARTITION part_2 ENGINE = MyISAM,
  PARTITION part_3 ENGINE = MyISAM,
@@ -37580,7 +37580,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -38572,7 +38572,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (1) ENGINE = MyISAM,
@@ -39529,7 +39529,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = MyISAM,
  PARTITION part_2 ENGINE = MyISAM,
  PARTITION part_3 ENGINE = MyISAM,
@@ -41481,7 +41481,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -42473,7 +42473,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (1) ENGINE = MyISAM,
@@ -43427,7 +43427,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = MyISAM,
  PARTITION part_2 ENGINE = MyISAM,
  PARTITION part_3 ENGINE = MyISAM,
@@ -45379,7 +45379,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -46371,7 +46371,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (1) ENGINE = MyISAM,
@@ -47325,7 +47325,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = MyISAM,
  PARTITION part_2 ENGINE = MyISAM,
  PARTITION part_3 ENGINE = MyISAM,
@@ -49277,7 +49277,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -50269,7 +50269,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (1) ENGINE = MyISAM,
@@ -51223,7 +51223,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = MyISAM,
  PARTITION part_2 ENGINE = MyISAM,
  PARTITION part_3 ENGINE = MyISAM,
@@ -53175,7 +53175,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -54167,7 +54167,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (1) ENGINE = MyISAM,
@@ -55121,7 +55121,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = MyISAM,
  PARTITION part_2 ENGINE = MyISAM,
  PARTITION part_3 ENGINE = MyISAM,
@@ -57073,7 +57073,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -58065,7 +58065,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (1) ENGINE = MyISAM,
@@ -59018,7 +59018,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = MyISAM,
  PARTITION part_2 ENGINE = MyISAM,
  PARTITION part_3 ENGINE = MyISAM,
@@ -60962,7 +60962,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -61950,7 +61950,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (1) ENGINE = MyISAM,
@@ -62900,7 +62900,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = MyISAM,
  PARTITION part_2 ENGINE = MyISAM,
  PARTITION part_3 ENGINE = MyISAM,
@@ -64844,7 +64844,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -65832,7 +65832,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (1) ENGINE = MyISAM,
@@ -67102,7 +67102,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = MyISAM,
  PARTITION part_2 ENGINE = MyISAM,
  PARTITION part_3 ENGINE = MyISAM,
@@ -69046,7 +69046,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -70034,7 +70034,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (1) ENGINE = MyISAM,
@@ -70991,7 +70991,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = MyISAM,
  PARTITION part_2 ENGINE = MyISAM,
  PARTITION part_3 ENGINE = MyISAM,
@@ -72943,7 +72943,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -73935,7 +73935,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (1) ENGINE = MyISAM,
@@ -74889,7 +74889,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = MyISAM,
  PARTITION part_2 ENGINE = MyISAM,
  PARTITION part_3 ENGINE = MyISAM,
@@ -76841,7 +76841,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -77833,7 +77833,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (1) ENGINE = MyISAM,
@@ -78787,7 +78787,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = MyISAM,
  PARTITION part_2 ENGINE = MyISAM,
  PARTITION part_3 ENGINE = MyISAM,
@@ -80739,7 +80739,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -81731,7 +81731,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (1) ENGINE = MyISAM,
@@ -82685,7 +82685,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = MyISAM,
  PARTITION part_2 ENGINE = MyISAM,
  PARTITION part_3 ENGINE = MyISAM,
@@ -84637,7 +84637,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -85629,7 +85629,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (1) ENGINE = MyISAM,
@@ -86583,7 +86583,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 (PARTITION part_1 ENGINE = MyISAM,
  PARTITION part_2 ENGINE = MyISAM,
  PARTITION part_3 ENGINE = MyISAM,
@@ -88535,7 +88535,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part_1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -89527,7 +89527,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part_1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part_2 VALUES IN (1) ENGINE = MyISAM,
diff --git a/mysql-test/suite/parts/r/partition_basic_innodb.result b/mysql-test/suite/parts/r/partition_basic_innodb.result
index e60a63bcde2..ea5a53fc5f4 100644
--- a/mysql-test/suite/parts/r/partition_basic_innodb.result
+++ b/mysql-test/suite/parts/r/partition_basic_innodb.result
@@ -528,7 +528,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 unified filelist
@@ -2390,7 +2390,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -3338,7 +3338,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -4253,7 +4253,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 ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 unified filelist
@@ -6113,7 +6113,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -7057,7 +7057,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -8015,7 +8015,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 KEY ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 unified filelist
@@ -10025,7 +10025,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -11047,7 +11047,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -12035,7 +12035,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 KEY ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 unified filelist
@@ -14045,7 +14045,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -15067,7 +15067,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -16071,7 +16071,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 KEY ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 unified filelist
@@ -18145,7 +18145,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -19199,7 +19199,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -20208,7 +20208,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 unified filelist
@@ -22216,7 +22216,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -23234,7 +23234,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -24222,7 +24222,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 unified filelist
@@ -26230,7 +26230,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -27248,7 +27248,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
@@ -28252,7 +28252,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 unified filelist
@@ -30324,7 +30324,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = InnoDB,
   SUBPARTITION subpart12 ENGINE = InnoDB),
@@ -31374,7 +31374,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = InnoDB,
  PARTITION part2 VALUES IN (1) ENGINE = InnoDB,
diff --git a/mysql-test/suite/parts/r/partition_basic_myisam.result b/mysql-test/suite/parts/r/partition_basic_myisam.result
index 3898d853f4a..f70dae13bb6 100644
--- a/mysql-test/suite/parts/r/partition_basic_myisam.result
+++ b/mysql-test/suite/parts/r/partition_basic_myisam.result
@@ -533,7 +533,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 ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 unified filelist
@@ -2453,7 +2453,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -3435,7 +3435,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
@@ -4374,7 +4374,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 ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 unified filelist
@@ -6292,7 +6292,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -7270,7 +7270,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
@@ -8268,7 +8268,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 KEY ALGORITHM = 2 (f_int1)
+/*!50100 PARTITION BY KEY (f_int1)
 PARTITIONS 5 */
 
 unified filelist
@@ -10400,7 +10400,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -11488,7 +11488,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+SUBPARTITION BY KEY (f_int1)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
@@ -12537,7 +12537,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 PARTITION BY KEY (f_int1,f_int2)
 PARTITIONS 5 */
 
 unified filelist
@@ -14667,7 +14667,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 (PARTITION part1 VALUES LESS THAN (0)
  (SUBPARTITION subpart11 ENGINE = MyISAM,
   SUBPARTITION subpart12 ENGINE = MyISAM),
@@ -15751,7 +15751,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+SUBPARTITION BY KEY (f_int2)
 SUBPARTITIONS 3
 (PARTITION part1 VALUES IN (0) ENGINE = MyISAM,
  PARTITION part2 VALUES IN (1) ENGINE = MyISAM,
diff --git a/mysql-test/suite/parts/r/partition_basic_symlink_myisam.result b/mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
index 5548c20552f..146b3d361fb 100644
--- a/mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
+++ b/mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
@@ -563,7 +563,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 ALGORITHM = 2 (f_int1)
+/*!50100 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,
@@ -2573,7 +2573,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (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,
   SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM),
@@ -3613,7 +3613,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+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,
@@ -4596,7 +4596,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 ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 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,
@@ -6604,7 +6604,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+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,
   SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM),
@@ -7644,7 +7644,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+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,
@@ -8686,7 +8686,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 KEY ALGORITHM = 2 (f_int1)
+/*!50100 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,
@@ -10908,7 +10908,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (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,
   SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM),
@@ -12054,7 +12054,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int1)
+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,
@@ -13147,7 +13147,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 KEY ALGORITHM = 2 (f_int1,f_int2)
+/*!50100 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,
@@ -15367,7 +15367,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+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,
   SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' ENGINE = MyISAM),
@@ -16513,7 +16513,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ABS(MOD(f_int1,2)))
-SUBPARTITION BY KEY ALGORITHM = 2 (f_int2)
+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,
@@ -19782,7 +19782,7 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (f_int1)
-SUBPARTITION BY KEY ALGORITHM = 2 (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,
   SUBPARTITION subpart12 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM),
diff --git a/mysql-test/suite/parts/r/partition_bit_innodb.result b/mysql-test/suite/parts/r/partition_bit_innodb.result
index ae5b567cb9a..a9ae917f13d 100644
--- a/mysql-test/suite/parts/r/partition_bit_innodb.result
+++ b/mysql-test/suite/parts/r/partition_bit_innodb.result
@@ -9,7 +9,7 @@ t1	CREATE TABLE `t1` (
   `a` bit(1) NOT NULL DEFAULT b'0',
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a) */
+/*!50100 PARTITION BY KEY (a) */
 drop table t1;
 create table t1 (a bit(0), primary key (a)) engine='INNODB' 
 partition by key (a) (
@@ -21,7 +21,7 @@ t1	CREATE TABLE `t1` (
   `a` bit(1) NOT NULL DEFAULT b'0',
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION pa1 ENGINE = InnoDB,
  PARTITION pa2 ENGINE = InnoDB) */
 drop table t1;
@@ -33,7 +33,7 @@ t1	CREATE TABLE `t1` (
   `a` bit(64) NOT NULL DEFAULT b'0',
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 2 */
 insert into t1 values 
 (b'1111111111111111111111111111111111111111111111111111111111111111'),
@@ -61,7 +61,7 @@ t1	CREATE TABLE `t1` (
   `a` bit(64) NOT NULL DEFAULT b'0',
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -91,7 +91,7 @@ t2	CREATE TABLE `t2` (
   `a` bit(1) NOT NULL DEFAULT b'0',
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 4 */
 insert into t2 values (b'0'), (b'1');
 select hex(a) from t2;
@@ -104,7 +104,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `a` bit(1) NOT NULL DEFAULT b'0'
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 4 */
 select hex(a) from t2;
 hex(a)
@@ -117,7 +117,7 @@ t2	CREATE TABLE `t2` (
   `a` bit(1) NOT NULL DEFAULT b'0',
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 4 */
 select hex(a) from t2;
 hex(a)
@@ -137,7 +137,7 @@ t3	CREATE TABLE `t3` (
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (a)
-SUBPARTITION BY KEY ALGORITHM = 2 (a)
+SUBPARTITION BY KEY (a)
 SUBPARTITIONS 2
 (PARTITION pa1 VALUES LESS THAN (3) ENGINE = InnoDB,
  PARTITION pa2 VALUES LESS THAN (16) ENGINE = InnoDB,
@@ -420,7 +420,7 @@ t4	CREATE TABLE `t4` (
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (a)
-SUBPARTITION BY KEY ALGORITHM = 2 (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,
diff --git a/mysql-test/suite/parts/r/partition_bit_myisam.result b/mysql-test/suite/parts/r/partition_bit_myisam.result
index e6a85247907..680845c9971 100644
--- a/mysql-test/suite/parts/r/partition_bit_myisam.result
+++ b/mysql-test/suite/parts/r/partition_bit_myisam.result
@@ -9,7 +9,7 @@ t1	CREATE TABLE `t1` (
   `a` bit(1) NOT NULL DEFAULT b'0',
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a) */
+/*!50100 PARTITION BY KEY (a) */
 drop table t1;
 create table t1 (a bit(0), primary key (a)) engine='MyISAM' 
 partition by key (a) (
@@ -21,7 +21,7 @@ t1	CREATE TABLE `t1` (
   `a` bit(1) NOT NULL DEFAULT b'0',
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION pa1 ENGINE = MyISAM,
  PARTITION pa2 ENGINE = MyISAM) */
 drop table t1;
@@ -33,7 +33,7 @@ t1	CREATE TABLE `t1` (
   `a` bit(64) NOT NULL DEFAULT b'0',
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 2 */
 insert into t1 values 
 (b'1111111111111111111111111111111111111111111111111111111111111111'),
@@ -61,7 +61,7 @@ t1	CREATE TABLE `t1` (
   `a` bit(64) NOT NULL DEFAULT b'0',
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -91,7 +91,7 @@ t2	CREATE TABLE `t2` (
   `a` bit(1) NOT NULL DEFAULT b'0',
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 4 */
 insert into t2 values (b'0'), (b'1');
 select hex(a) from t2;
@@ -104,7 +104,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `a` bit(1) NOT NULL DEFAULT b'0'
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 4 */
 select hex(a) from t2;
 hex(a)
@@ -117,7 +117,7 @@ t2	CREATE TABLE `t2` (
   `a` bit(1) NOT NULL DEFAULT b'0',
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 4 */
 select hex(a) from t2;
 hex(a)
@@ -137,7 +137,7 @@ t3	CREATE TABLE `t3` (
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (a)
-SUBPARTITION BY KEY ALGORITHM = 2 (a)
+SUBPARTITION BY KEY (a)
 SUBPARTITIONS 2
 (PARTITION pa1 VALUES LESS THAN (3) ENGINE = MyISAM,
  PARTITION pa2 VALUES LESS THAN (16) ENGINE = MyISAM,
@@ -420,7 +420,7 @@ t4	CREATE TABLE `t4` (
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (a)
-SUBPARTITION BY KEY ALGORITHM = 2 (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,
diff --git a/mysql-test/suite/parts/r/partition_char_innodb.result b/mysql-test/suite/parts/r/partition_char_innodb.result
index e385d6bc427..dc7d259c2af 100644
--- a/mysql-test/suite/parts/r/partition_char_innodb.result
+++ b/mysql-test/suite/parts/r/partition_char_innodb.result
@@ -11,7 +11,7 @@ t1	CREATE TABLE `t1` (
   `a` char(255) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -42,7 +42,7 @@ t2	CREATE TABLE `t2` (
   `a` char(255) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 27 */
 26 inserts;
 insert into t2 values (repeat(char(ascii('a')+0),26+54));
@@ -116,7 +116,7 @@ t1	CREATE TABLE `t1` (
   `a` binary(255) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -150,7 +150,7 @@ t2	CREATE TABLE `t2` (
   `a` binary(255) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 27 */
 26 inserts;
 insert into t2 values (repeat(char(ascii('a')+0),26+54));
@@ -224,7 +224,7 @@ t1	CREATE TABLE `t1` (
   `a` varchar(767) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -255,7 +255,7 @@ t2	CREATE TABLE `t2` (
   `a` varchar(767) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 27 */
 26 inserts;
 insert into t2 values (repeat(char(ascii('a')+0),26*26));
@@ -329,7 +329,7 @@ t1	CREATE TABLE `t1` (
   `a` varbinary(767) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -360,7 +360,7 @@ t2	CREATE TABLE `t2` (
   `a` varbinary(767) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 30 */
 26 inserts;
 insert into t2 values (repeat(char(ascii('a')+0),26*26));
@@ -434,7 +434,7 @@ t1	CREATE TABLE `t1` (
   `a` enum('A','B','C','D','E','F','G','H','I','J','K','L') NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -476,7 +476,7 @@ t2	CREATE TABLE `t2` (
   `a` enum('1','2','3','4','5','6','7','8','9','0','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z') NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 27 */
 0 inserts;
 insert into t2 values (char(ascii('A')+26));
@@ -563,7 +563,7 @@ t1	CREATE TABLE `t1` (
   `a` set('A','B','C','D','E','F','G','H','I','J','K','L') NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -605,7 +605,7 @@ t2	CREATE TABLE `t2` (
   `a` set('1','2','3','4','5','6','7','8','9','0','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z') NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 27 */
 insert into t2 values ('A'),('B'),('C'),('D'),('E'),('F'),('G'),('H'),('I'),('K'),('L'),('M'),('N'),('O'),('P'),('Q'),('S'),('T'),('U'),('V'),('X'),('Y'),('Z');
 insert into t2 values ('A,B'),('B,C'),('C,D'),('D,E'),('E,F'),('F,G'),('G,H'),('H,I'),('I,J'),('K,L'),('L,M'),('M,N'),('N,O'),('O,P'),('P,Q'),('Q,R'),('S,T'),('T,U'),('U,V'),('V,W'),('X,Y'),('Y,Z'),('Z,A');
diff --git a/mysql-test/suite/parts/r/partition_char_myisam.result b/mysql-test/suite/parts/r/partition_char_myisam.result
index 9f8c306b9f4..80f738c4b7b 100644
--- a/mysql-test/suite/parts/r/partition_char_myisam.result
+++ b/mysql-test/suite/parts/r/partition_char_myisam.result
@@ -11,7 +11,7 @@ t1	CREATE TABLE `t1` (
   `a` char(255) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -42,7 +42,7 @@ t2	CREATE TABLE `t2` (
   `a` char(255) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 27 */
 26 inserts;
 insert into t2 values (repeat(char(ascii('a')+0),26+54));
@@ -116,7 +116,7 @@ t1	CREATE TABLE `t1` (
   `a` binary(255) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -150,7 +150,7 @@ t2	CREATE TABLE `t2` (
   `a` binary(255) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 27 */
 26 inserts;
 insert into t2 values (repeat(char(ascii('a')+0),26+54));
@@ -224,7 +224,7 @@ t1	CREATE TABLE `t1` (
   `a` varchar(767) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -255,7 +255,7 @@ t2	CREATE TABLE `t2` (
   `a` varchar(767) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 27 */
 26 inserts;
 insert into t2 values (repeat(char(ascii('a')+0),26*26));
@@ -329,7 +329,7 @@ t1	CREATE TABLE `t1` (
   `a` varbinary(767) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -360,7 +360,7 @@ t2	CREATE TABLE `t2` (
   `a` varbinary(767) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 30 */
 26 inserts;
 insert into t2 values (repeat(char(ascii('a')+0),26*26));
@@ -434,7 +434,7 @@ t1	CREATE TABLE `t1` (
   `a` enum('A','B','C','D','E','F','G','H','I','J','K','L') NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -476,7 +476,7 @@ t2	CREATE TABLE `t2` (
   `a` enum('1','2','3','4','5','6','7','8','9','0','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z') NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 27 */
 0 inserts;
 insert into t2 values (char(ascii('A')+26));
@@ -563,7 +563,7 @@ t1	CREATE TABLE `t1` (
   `a` set('A','B','C','D','E','F','G','H','I','J','K','L') NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -605,7 +605,7 @@ t2	CREATE TABLE `t2` (
   `a` set('1','2','3','4','5','6','7','8','9','0','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z') NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 27 */
 insert into t2 values ('A'),('B'),('C'),('D'),('E'),('F'),('G'),('H'),('I'),('K'),('L'),('M'),('N'),('O'),('P'),('Q'),('S'),('T'),('U'),('V'),('X'),('Y'),('Z');
 insert into t2 values ('A,B'),('B,C'),('C,D'),('D,E'),('E,F'),('F,G'),('G,H'),('H,I'),('I,J'),('K,L'),('L,M'),('M,N'),('N,O'),('O,P'),('P,Q'),('Q,R'),('S,T'),('T,U'),('U,V'),('V,W'),('X,Y'),('Y,Z'),('Z,A');
diff --git a/mysql-test/suite/parts/r/partition_datetime_innodb.result b/mysql-test/suite/parts/r/partition_datetime_innodb.result
index 0b878578188..48af3343d9a 100644
--- a/mysql-test/suite/parts/r/partition_datetime_innodb.result
+++ b/mysql-test/suite/parts/r/partition_datetime_innodb.result
@@ -10,7 +10,7 @@ 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 ALGORITHM = 2 (a)
+/*!50100 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,
@@ -40,7 +40,7 @@ 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 ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 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;
@@ -196,7 +196,7 @@ t1	CREATE TABLE `t1` (
   `a` date NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -226,7 +226,7 @@ t2	CREATE TABLE `t2` (
   `a` date NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 12 */
 insert into t2 values ('1975-01-01'), ('2020-12-31'), ('1980-10-14'), ('2000-06-15');
 select * from t2;
@@ -435,7 +435,7 @@ t3	CREATE TABLE `t3` (
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (month(a))
-SUBPARTITION BY KEY ALGORITHM = 2 (a)
+SUBPARTITION BY KEY (a)
 SUBPARTITIONS 3
 (PARTITION quarter1 VALUES LESS THAN (4) ENGINE = InnoDB,
  PARTITION quarter2 VALUES LESS THAN (7) ENGINE = InnoDB,
@@ -487,7 +487,7 @@ t4	CREATE TABLE `t4` (
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (month(a))
-SUBPARTITION BY KEY ALGORITHM = 2 (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,
@@ -536,7 +536,7 @@ t1	CREATE TABLE `t1` (
   `a` time NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -566,7 +566,7 @@ t2	CREATE TABLE `t2` (
   `a` time NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 12 */
 insert into t2 values ('0:1:1'), ('10:11:12'), ('13:14:15'), ('14:15:16');
 select * from t2;
@@ -725,7 +725,7 @@ t3	CREATE TABLE `t3` (
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (second(a))
-SUBPARTITION BY KEY ALGORITHM = 2 (a)
+SUBPARTITION BY KEY (a)
 SUBPARTITIONS 3
 (PARTITION quarter1 VALUES LESS THAN (16) ENGINE = InnoDB,
  PARTITION quarter2 VALUES LESS THAN (31) ENGINE = InnoDB,
@@ -871,7 +871,7 @@ t4	CREATE TABLE `t4` (
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (second(a))
-SUBPARTITION BY KEY ALGORITHM = 2 (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,
@@ -1014,7 +1014,7 @@ t1	CREATE TABLE `t1` (
   `a` datetime NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -1044,7 +1044,7 @@ t2	CREATE TABLE `t2` (
   `a` datetime NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 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;
@@ -1203,7 +1203,7 @@ t3	CREATE TABLE `t3` (
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (month(a))
-SUBPARTITION BY KEY ALGORITHM = 2 (a)
+SUBPARTITION BY KEY (a)
 SUBPARTITIONS 3
 (PARTITION quarter1 VALUES LESS THAN (4) ENGINE = InnoDB,
  PARTITION quarter2 VALUES LESS THAN (7) ENGINE = InnoDB,
@@ -1255,7 +1255,7 @@ t4	CREATE TABLE `t4` (
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (month(a))
-SUBPARTITION BY KEY ALGORITHM = 2 (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,
@@ -1304,7 +1304,7 @@ t1	CREATE TABLE `t1` (
   `a` year(4) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -1334,7 +1334,7 @@ t2	CREATE TABLE `t2` (
   `a` year(4) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 12 */
 insert into t2 values ('1975'), ('2020'), ('1980'), ('2000');
 select * from t2;
diff --git a/mysql-test/suite/parts/r/partition_datetime_myisam.result b/mysql-test/suite/parts/r/partition_datetime_myisam.result
index 5c87096f373..146f291546e 100644
--- a/mysql-test/suite/parts/r/partition_datetime_myisam.result
+++ b/mysql-test/suite/parts/r/partition_datetime_myisam.result
@@ -10,7 +10,7 @@ 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 ALGORITHM = 2 (a)
+/*!50100 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,
@@ -40,7 +40,7 @@ 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 ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 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;
@@ -196,7 +196,7 @@ t1	CREATE TABLE `t1` (
   `a` date NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -226,7 +226,7 @@ t2	CREATE TABLE `t2` (
   `a` date NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 12 */
 insert into t2 values ('1975-01-01'), ('2020-12-31'), ('1980-10-14'), ('2000-06-15');
 select * from t2;
@@ -435,7 +435,7 @@ t3	CREATE TABLE `t3` (
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (month(a))
-SUBPARTITION BY KEY ALGORITHM = 2 (a)
+SUBPARTITION BY KEY (a)
 SUBPARTITIONS 3
 (PARTITION quarter1 VALUES LESS THAN (4) ENGINE = MyISAM,
  PARTITION quarter2 VALUES LESS THAN (7) ENGINE = MyISAM,
@@ -487,7 +487,7 @@ t4	CREATE TABLE `t4` (
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (month(a))
-SUBPARTITION BY KEY ALGORITHM = 2 (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,
@@ -536,7 +536,7 @@ t1	CREATE TABLE `t1` (
   `a` time NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -566,7 +566,7 @@ t2	CREATE TABLE `t2` (
   `a` time NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 12 */
 insert into t2 values ('0:1:1'), ('10:11:12'), ('13:14:15'), ('14:15:16');
 select * from t2;
@@ -725,7 +725,7 @@ t3	CREATE TABLE `t3` (
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (second(a))
-SUBPARTITION BY KEY ALGORITHM = 2 (a)
+SUBPARTITION BY KEY (a)
 SUBPARTITIONS 3
 (PARTITION quarter1 VALUES LESS THAN (16) ENGINE = MyISAM,
  PARTITION quarter2 VALUES LESS THAN (31) ENGINE = MyISAM,
@@ -871,7 +871,7 @@ t4	CREATE TABLE `t4` (
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (second(a))
-SUBPARTITION BY KEY ALGORITHM = 2 (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,
@@ -1014,7 +1014,7 @@ t1	CREATE TABLE `t1` (
   `a` datetime NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -1044,7 +1044,7 @@ t2	CREATE TABLE `t2` (
   `a` datetime NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 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;
@@ -1203,7 +1203,7 @@ t3	CREATE TABLE `t3` (
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (month(a))
-SUBPARTITION BY KEY ALGORITHM = 2 (a)
+SUBPARTITION BY KEY (a)
 SUBPARTITIONS 3
 (PARTITION quarter1 VALUES LESS THAN (4) ENGINE = MyISAM,
  PARTITION quarter2 VALUES LESS THAN (7) ENGINE = MyISAM,
@@ -1255,7 +1255,7 @@ t4	CREATE TABLE `t4` (
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (month(a))
-SUBPARTITION BY KEY ALGORITHM = 2 (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,
@@ -1304,7 +1304,7 @@ t1	CREATE TABLE `t1` (
   `a` year(4) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -1334,7 +1334,7 @@ t2	CREATE TABLE `t2` (
   `a` year(4) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 12 */
 insert into t2 values ('1975'), ('2020'), ('1980'), ('2000');
 select * from t2;
diff --git a/mysql-test/suite/parts/r/partition_decimal_innodb.result b/mysql-test/suite/parts/r/partition_decimal_innodb.result
index 8c7617aa54e..c69c880cc6f 100644
--- a/mysql-test/suite/parts/r/partition_decimal_innodb.result
+++ b/mysql-test/suite/parts/r/partition_decimal_innodb.result
@@ -10,7 +10,7 @@ t1	CREATE TABLE `t1` (
   `a` decimal(10,4) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -54,7 +54,7 @@ t2	CREATE TABLE `t2` (
   `a` decimal(18,9) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 10 */
 insert into t2 values (999999999.999999999), (-999999999.999999999), (-1.5), (-1), (0), (1.5), (1234.567), (-1234.567);
 select * from t2;
@@ -101,7 +101,7 @@ t3	CREATE TABLE `t3` (
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (floor(a))
-SUBPARTITION BY KEY ALGORITHM = 2 (a)
+SUBPARTITION BY KEY (a)
 SUBPARTITIONS 2
 (PARTITION pa2 VALUES LESS THAN (2) ENGINE = InnoDB,
  PARTITION pa4 VALUES LESS THAN (4) ENGINE = InnoDB,
@@ -155,7 +155,7 @@ t4	CREATE TABLE `t4` (
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ceiling(a))
-SUBPARTITION BY KEY ALGORITHM = 2 (a)
+SUBPARTITION BY KEY (a)
 SUBPARTITIONS 2
 (PARTITION pa2 VALUES IN (1,2) ENGINE = InnoDB,
  PARTITION pa4 VALUES IN (3,4) ENGINE = InnoDB,
diff --git a/mysql-test/suite/parts/r/partition_decimal_myisam.result b/mysql-test/suite/parts/r/partition_decimal_myisam.result
index 54392cfaf40..cdafb721ea4 100644
--- a/mysql-test/suite/parts/r/partition_decimal_myisam.result
+++ b/mysql-test/suite/parts/r/partition_decimal_myisam.result
@@ -10,7 +10,7 @@ t1	CREATE TABLE `t1` (
   `a` decimal(10,4) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -54,7 +54,7 @@ t2	CREATE TABLE `t2` (
   `a` decimal(18,9) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 10 */
 insert into t2 values (999999999.999999999), (-999999999.999999999), (-1.5), (-1), (0), (1.5), (1234.567), (-1234.567);
 select * from t2;
@@ -101,7 +101,7 @@ t3	CREATE TABLE `t3` (
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (floor(a))
-SUBPARTITION BY KEY ALGORITHM = 2 (a)
+SUBPARTITION BY KEY (a)
 SUBPARTITIONS 2
 (PARTITION pa2 VALUES LESS THAN (2) ENGINE = MyISAM,
  PARTITION pa4 VALUES LESS THAN (4) ENGINE = MyISAM,
@@ -155,7 +155,7 @@ t4	CREATE TABLE `t4` (
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY LIST (ceiling(a))
-SUBPARTITION BY KEY ALGORITHM = 2 (a)
+SUBPARTITION BY KEY (a)
 SUBPARTITIONS 2
 (PARTITION pa2 VALUES IN (1,2) ENGINE = MyISAM,
  PARTITION pa4 VALUES IN (3,4) ENGINE = MyISAM,
diff --git a/mysql-test/suite/parts/r/partition_float_innodb.result b/mysql-test/suite/parts/r/partition_float_innodb.result
index a80606d42ac..d2f04a68629 100644
--- a/mysql-test/suite/parts/r/partition_float_innodb.result
+++ b/mysql-test/suite/parts/r/partition_float_innodb.result
@@ -10,7 +10,7 @@ t1	CREATE TABLE `t1` (
   `a` float NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -46,7 +46,7 @@ t2	CREATE TABLE `t2` (
   `a` float NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 10 */
 insert into t2 values (-3.402823466E+38), (-3.402823466E+37), (-123.456), (0), (1234546.789), (123.456), (1.5);
 select * from t2;
@@ -100,7 +100,7 @@ t1	CREATE TABLE `t1` (
   `a` double NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -138,7 +138,7 @@ t2	CREATE TABLE `t2` (
   `a` double NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 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;
diff --git a/mysql-test/suite/parts/r/partition_float_myisam.result b/mysql-test/suite/parts/r/partition_float_myisam.result
index 035cdd7424d..2d52d095989 100644
--- a/mysql-test/suite/parts/r/partition_float_myisam.result
+++ b/mysql-test/suite/parts/r/partition_float_myisam.result
@@ -10,7 +10,7 @@ t1	CREATE TABLE `t1` (
   `a` float NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -46,7 +46,7 @@ t2	CREATE TABLE `t2` (
   `a` float NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 10 */
 insert into t2 values (-3.402823466E+38), (-3.402823466E+37), (-123.456), (0), (1234546.789), (123.456), (1.5);
 select * from t2;
@@ -100,7 +100,7 @@ t1	CREATE TABLE `t1` (
   `a` double NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -138,7 +138,7 @@ t2	CREATE TABLE `t2` (
   `a` double NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 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;
diff --git a/mysql-test/suite/parts/r/partition_int_innodb.result b/mysql-test/suite/parts/r/partition_int_innodb.result
index b419f5d627e..7a51b80d5d7 100644
--- a/mysql-test/suite/parts/r/partition_int_innodb.result
+++ b/mysql-test/suite/parts/r/partition_int_innodb.result
@@ -10,7 +10,7 @@ t1	CREATE TABLE `t1` (
   `a` tinyint(3) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -46,7 +46,7 @@ t2	CREATE TABLE `t2` (
   `a` tinyint(3) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 8 */
 insert into t2 values (255), (254), (253), (252);
 select * from t2;
@@ -78,7 +78,7 @@ t3	CREATE TABLE `t3` (
   `a` tinyint(4) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 7 */
 insert into t3 values (127), (126), (125), (124), (-128), (-127), (1), (-1), (0);
 select * from t3;
@@ -119,7 +119,7 @@ t1	CREATE TABLE `t1` (
   `a` smallint(5) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -155,7 +155,7 @@ t2	CREATE TABLE `t2` (
   `a` smallint(5) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 8 */
 insert into t2 values (65535), (65534), (65533), (65532);
 select * from t2;
@@ -187,7 +187,7 @@ t3	CREATE TABLE `t3` (
   `a` smallint(6) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 7 */
 insert into t3 values (32767), (32766), (32765), (32764), (-32768), (-32767), (1), (-1), (0);
 select * from t3;
@@ -228,7 +228,7 @@ t1	CREATE TABLE `t1` (
   `a` int(10) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -264,7 +264,7 @@ t2	CREATE TABLE `t2` (
   `a` int(10) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 8 */
 insert into t2 values (4294967295), (4294967294), (4294967293), (4294967292);
 select * from t2;
@@ -296,7 +296,7 @@ t3	CREATE TABLE `t3` (
   `a` int(11) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 7 */
 insert into t3 values (2147483647), (2147483646), (2147483645), (2147483644), (-2147483648), (-2147483647), (1), (-1), (0);
 select * from t3;
@@ -337,7 +337,7 @@ t1	CREATE TABLE `t1` (
   `a` mediumint(8) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -373,7 +373,7 @@ t2	CREATE TABLE `t2` (
   `a` mediumint(8) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 8 */
 insert into t2 values (16777215), (16777214), (16777213), (16777212);
 select * from t2;
@@ -405,7 +405,7 @@ t3	CREATE TABLE `t3` (
   `a` mediumint(9) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 7 */
 insert into t3 values (8388607), (8388606), (8388605), (8388604), (-8388608), (-8388607), (1), (-1), (0);
 select * from t3;
@@ -446,7 +446,7 @@ t1	CREATE TABLE `t1` (
   `a` bigint(20) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -494,7 +494,7 @@ t2	CREATE TABLE `t2` (
   `a` bigint(20) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 8 */
 insert into t2 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE), (18446744073709551613), (18446744073709551612);
 select * from t2;
@@ -526,7 +526,7 @@ t3	CREATE TABLE `t3` (
   `a` bigint(20) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 7 */
 insert into t3 values (9223372036854775807), (9223372036854775806), (9223372036854775805), (9223372036854775804), (-9223372036854775808), (-9223372036854775807), (1), (-1), (0);
 select * from t3;
diff --git a/mysql-test/suite/parts/r/partition_int_myisam.result b/mysql-test/suite/parts/r/partition_int_myisam.result
index a7520e8f3e3..4387bbfdd78 100644
--- a/mysql-test/suite/parts/r/partition_int_myisam.result
+++ b/mysql-test/suite/parts/r/partition_int_myisam.result
@@ -10,7 +10,7 @@ t1	CREATE TABLE `t1` (
   `a` tinyint(3) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -46,7 +46,7 @@ t2	CREATE TABLE `t2` (
   `a` tinyint(3) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 8 */
 insert into t2 values (255), (254), (253), (252);
 select * from t2;
@@ -78,7 +78,7 @@ t3	CREATE TABLE `t3` (
   `a` tinyint(4) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 7 */
 insert into t3 values (127), (126), (125), (124), (-128), (-127), (1), (-1), (0);
 select * from t3;
@@ -119,7 +119,7 @@ t1	CREATE TABLE `t1` (
   `a` smallint(5) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -155,7 +155,7 @@ t2	CREATE TABLE `t2` (
   `a` smallint(5) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 8 */
 insert into t2 values (65535), (65534), (65533), (65532);
 select * from t2;
@@ -187,7 +187,7 @@ t3	CREATE TABLE `t3` (
   `a` smallint(6) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 7 */
 insert into t3 values (32767), (32766), (32765), (32764), (-32768), (-32767), (1), (-1), (0);
 select * from t3;
@@ -228,7 +228,7 @@ t1	CREATE TABLE `t1` (
   `a` int(10) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -264,7 +264,7 @@ t2	CREATE TABLE `t2` (
   `a` int(10) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 8 */
 insert into t2 values (4294967295), (4294967294), (4294967293), (4294967292);
 select * from t2;
@@ -296,7 +296,7 @@ t3	CREATE TABLE `t3` (
   `a` int(11) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 7 */
 insert into t3 values (2147483647), (2147483646), (2147483645), (2147483644), (-2147483648), (-2147483647), (1), (-1), (0);
 select * from t3;
@@ -337,7 +337,7 @@ t1	CREATE TABLE `t1` (
   `a` mediumint(8) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -373,7 +373,7 @@ t2	CREATE TABLE `t2` (
   `a` mediumint(8) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 8 */
 insert into t2 values (16777215), (16777214), (16777213), (16777212);
 select * from t2;
@@ -405,7 +405,7 @@ t3	CREATE TABLE `t3` (
   `a` mediumint(9) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 7 */
 insert into t3 values (8388607), (8388606), (8388605), (8388604), (-8388608), (-8388607), (1), (-1), (0);
 select * from t3;
@@ -446,7 +446,7 @@ t1	CREATE TABLE `t1` (
   `a` bigint(20) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 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,
@@ -494,7 +494,7 @@ t2	CREATE TABLE `t2` (
   `a` bigint(20) unsigned NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 8 */
 insert into t2 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE), (18446744073709551613), (18446744073709551612);
 select * from t2;
@@ -526,7 +526,7 @@ t3	CREATE TABLE `t3` (
   `a` bigint(20) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 PARTITIONS 7 */
 insert into t3 values (9223372036854775807), (9223372036854775806), (9223372036854775805), (9223372036854775804), (-9223372036854775808), (-9223372036854775807), (1), (-1), (0);
 select * from t3;
diff --git a/mysql-test/suite/parts/r/partition_mgm_lc0_archive.result b/mysql-test/suite/parts/r/partition_mgm_lc0_archive.result
index d5a4adc298c..f4d76874b4c 100644
--- a/mysql-test/suite/parts/r/partition_mgm_lc0_archive.result
+++ b/mysql-test/suite/parts/r/partition_mgm_lc0_archive.result
@@ -56,7 +56,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = ARCHIVE,
  PARTITION partB ENGINE = ARCHIVE,
  PARTITION Partc ENGINE = ARCHIVE,
@@ -84,7 +84,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = ARCHIVE,
  PARTITION partB ENGINE = ARCHIVE,
  PARTITION Partc ENGINE = ARCHIVE) */
@@ -120,7 +120,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = ARCHIVE,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = ARCHIVE,
  PARTITION Partc ENGINE = ARCHIVE) */
@@ -199,7 +199,7 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = ARCHIVE,
  PARTITION partB ENGINE = ARCHIVE,
  PARTITION Partc ENGINE = ARCHIVE,
diff --git a/mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result b/mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result
index 5c933a3ebab..19f16780d13 100644
--- a/mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result
+++ b/mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result
@@ -56,7 +56,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = InnoDB,
  PARTITION partB ENGINE = InnoDB,
  PARTITION Partc ENGINE = InnoDB,
@@ -84,7 +84,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = InnoDB,
  PARTITION partB ENGINE = InnoDB,
  PARTITION Partc ENGINE = InnoDB) */
@@ -120,7 +120,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = InnoDB,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = InnoDB,
  PARTITION Partc ENGINE = InnoDB) */
@@ -199,7 +199,7 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = InnoDB,
  PARTITION partB ENGINE = InnoDB,
  PARTITION Partc ENGINE = InnoDB,
diff --git a/mysql-test/suite/parts/r/partition_mgm_lc0_memory.result b/mysql-test/suite/parts/r/partition_mgm_lc0_memory.result
index 3cc03cc3e5e..69a43b64d87 100644
--- a/mysql-test/suite/parts/r/partition_mgm_lc0_memory.result
+++ b/mysql-test/suite/parts/r/partition_mgm_lc0_memory.result
@@ -56,7 +56,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = MEMORY,
  PARTITION partB ENGINE = MEMORY,
  PARTITION Partc ENGINE = MEMORY,
@@ -84,7 +84,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = MEMORY,
  PARTITION partB ENGINE = MEMORY,
  PARTITION Partc ENGINE = MEMORY) */
@@ -120,7 +120,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MEMORY,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MEMORY,
  PARTITION Partc ENGINE = MEMORY) */
@@ -199,7 +199,7 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = MEMORY,
  PARTITION partB ENGINE = MEMORY,
  PARTITION Partc ENGINE = MEMORY,
diff --git a/mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result b/mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result
index 98f39b0fcec..9b4e85be9d0 100644
--- a/mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result
+++ b/mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result
@@ -56,7 +56,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = MyISAM,
  PARTITION partB ENGINE = MyISAM,
  PARTITION Partc ENGINE = MyISAM,
@@ -84,7 +84,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = MyISAM,
  PARTITION partB ENGINE = MyISAM,
  PARTITION Partc ENGINE = MyISAM) */
@@ -120,7 +120,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MyISAM,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MyISAM,
  PARTITION Partc ENGINE = MyISAM) */
@@ -199,7 +199,7 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = MyISAM,
  PARTITION partB ENGINE = MyISAM,
  PARTITION Partc ENGINE = MyISAM,
diff --git a/mysql-test/suite/parts/r/partition_mgm_lc1_archive.result b/mysql-test/suite/parts/r/partition_mgm_lc1_archive.result
index 79aad61bbec..1113e7dcb0c 100644
--- a/mysql-test/suite/parts/r/partition_mgm_lc1_archive.result
+++ b/mysql-test/suite/parts/r/partition_mgm_lc1_archive.result
@@ -56,7 +56,7 @@ Table	Create Table
 TableA	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = ARCHIVE,
  PARTITION partB ENGINE = ARCHIVE,
  PARTITION Partc ENGINE = ARCHIVE,
@@ -84,7 +84,7 @@ Table	Create Table
 TableA	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = ARCHIVE,
  PARTITION partB ENGINE = ARCHIVE,
  PARTITION Partc ENGINE = ARCHIVE) */
@@ -120,7 +120,7 @@ Table	Create Table
 TableA	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = ARCHIVE,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = ARCHIVE,
  PARTITION Partc ENGINE = ARCHIVE) */
@@ -192,7 +192,7 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = ARCHIVE,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = ARCHIVE,
  PARTITION Partc ENGINE = ARCHIVE) */
diff --git a/mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result b/mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result
index 399230237ad..952f4136cb6 100644
--- a/mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result
+++ b/mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result
@@ -56,7 +56,7 @@ Table	Create Table
 TableA	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = InnoDB,
  PARTITION partB ENGINE = InnoDB,
  PARTITION Partc ENGINE = InnoDB,
@@ -84,7 +84,7 @@ Table	Create Table
 TableA	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = InnoDB,
  PARTITION partB ENGINE = InnoDB,
  PARTITION Partc ENGINE = InnoDB) */
@@ -120,7 +120,7 @@ Table	Create Table
 TableA	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = InnoDB,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = InnoDB,
  PARTITION Partc ENGINE = InnoDB) */
@@ -192,7 +192,7 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = InnoDB,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = InnoDB,
  PARTITION Partc ENGINE = InnoDB) */
diff --git a/mysql-test/suite/parts/r/partition_mgm_lc1_memory.result b/mysql-test/suite/parts/r/partition_mgm_lc1_memory.result
index c6b9edd9ff5..435a0d8313e 100644
--- a/mysql-test/suite/parts/r/partition_mgm_lc1_memory.result
+++ b/mysql-test/suite/parts/r/partition_mgm_lc1_memory.result
@@ -56,7 +56,7 @@ Table	Create Table
 TableA	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = MEMORY,
  PARTITION partB ENGINE = MEMORY,
  PARTITION Partc ENGINE = MEMORY,
@@ -84,7 +84,7 @@ Table	Create Table
 TableA	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = MEMORY,
  PARTITION partB ENGINE = MEMORY,
  PARTITION Partc ENGINE = MEMORY) */
@@ -120,7 +120,7 @@ Table	Create Table
 TableA	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MEMORY,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MEMORY,
  PARTITION Partc ENGINE = MEMORY) */
@@ -192,7 +192,7 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MEMORY,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MEMORY,
  PARTITION Partc ENGINE = MEMORY) */
diff --git a/mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result b/mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result
index 9a7231e99e7..3a90ce4d73c 100644
--- a/mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result
+++ b/mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result
@@ -56,7 +56,7 @@ Table	Create Table
 TableA	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = MyISAM,
  PARTITION partB ENGINE = MyISAM,
  PARTITION Partc ENGINE = MyISAM,
@@ -84,7 +84,7 @@ Table	Create Table
 TableA	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = MyISAM,
  PARTITION partB ENGINE = MyISAM,
  PARTITION Partc ENGINE = MyISAM) */
@@ -120,7 +120,7 @@ Table	Create Table
 TableA	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MyISAM,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MyISAM,
  PARTITION Partc ENGINE = MyISAM) */
@@ -192,7 +192,7 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MyISAM,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MyISAM,
  PARTITION Partc ENGINE = MyISAM) */
diff --git a/mysql-test/suite/parts/r/partition_mgm_lc2_archive.result b/mysql-test/suite/parts/r/partition_mgm_lc2_archive.result
index 42e59f724f4..e71803fcac9 100644
--- a/mysql-test/suite/parts/r/partition_mgm_lc2_archive.result
+++ b/mysql-test/suite/parts/r/partition_mgm_lc2_archive.result
@@ -56,7 +56,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = ARCHIVE,
  PARTITION partB ENGINE = ARCHIVE,
  PARTITION Partc ENGINE = ARCHIVE,
@@ -84,7 +84,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = ARCHIVE,
  PARTITION partB ENGINE = ARCHIVE,
  PARTITION Partc ENGINE = ARCHIVE) */
@@ -120,7 +120,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = ARCHIVE,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = ARCHIVE,
  PARTITION Partc ENGINE = ARCHIVE) */
@@ -192,7 +192,7 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = ARCHIVE,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = ARCHIVE,
  PARTITION Partc ENGINE = ARCHIVE) */
diff --git a/mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result b/mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result
index 302ef7a7b2a..8e42bc9eb62 100644
--- a/mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result
+++ b/mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result
@@ -56,7 +56,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = InnoDB,
  PARTITION partB ENGINE = InnoDB,
  PARTITION Partc ENGINE = InnoDB,
@@ -84,7 +84,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = InnoDB,
  PARTITION partB ENGINE = InnoDB,
  PARTITION Partc ENGINE = InnoDB) */
@@ -120,7 +120,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = InnoDB,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = InnoDB,
  PARTITION Partc ENGINE = InnoDB) */
@@ -192,7 +192,7 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = InnoDB,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = InnoDB,
  PARTITION Partc ENGINE = InnoDB) */
diff --git a/mysql-test/suite/parts/r/partition_mgm_lc2_memory.result b/mysql-test/suite/parts/r/partition_mgm_lc2_memory.result
index 21124e3fed7..24047912ab1 100644
--- a/mysql-test/suite/parts/r/partition_mgm_lc2_memory.result
+++ b/mysql-test/suite/parts/r/partition_mgm_lc2_memory.result
@@ -56,7 +56,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = MEMORY,
  PARTITION partB ENGINE = MEMORY,
  PARTITION Partc ENGINE = MEMORY,
@@ -84,7 +84,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = MEMORY,
  PARTITION partB ENGINE = MEMORY,
  PARTITION Partc ENGINE = MEMORY) */
@@ -120,7 +120,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MEMORY,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MEMORY,
  PARTITION Partc ENGINE = MEMORY) */
@@ -192,7 +192,7 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MEMORY,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MEMORY,
  PARTITION Partc ENGINE = MEMORY) */
diff --git a/mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result b/mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result
index a77f44191a5..7a61a811ea3 100644
--- a/mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result
+++ b/mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result
@@ -56,7 +56,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = MyISAM,
  PARTITION partB ENGINE = MyISAM,
  PARTITION Partc ENGINE = MyISAM,
@@ -84,7 +84,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION parta ENGINE = MyISAM,
  PARTITION partB ENGINE = MyISAM,
  PARTITION Partc ENGINE = MyISAM) */
@@ -120,7 +120,7 @@ Table	Create Table
 TableA	CREATE TABLE `TableA` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MyISAM,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MyISAM,
  PARTITION Partc ENGINE = MyISAM) */
@@ -192,7 +192,7 @@ Table	Create Table
 tablea	CREATE TABLE `tablea` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a)
+/*!50100 PARTITION BY KEY (a)
 (PARTITION partB COMMENT = 'Previusly named parta' ENGINE = MyISAM,
  PARTITION parta COMMENT = 'Previusly named partB' ENGINE = MyISAM,
  PARTITION Partc ENGINE = MyISAM) */
diff --git a/mysql-test/suite/parts/r/partition_special_innodb.result b/mysql-test/suite/parts/r/partition_special_innodb.result
index 1b793b8c7df..c1213e86afc 100644
--- a/mysql-test/suite/parts/r/partition_special_innodb.result
+++ b/mysql-test/suite/parts/r/partition_special_innodb.result
@@ -13,7 +13,7 @@ t1	CREATE TABLE `t1` (
   `d` enum('m','w') NOT NULL DEFAULT 'm',
   PRIMARY KEY (`a`,`b`,`c`,`d`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a,b,c,d)
+/*!50100 PARTITION BY KEY (a,b,c,d)
 (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,
@@ -55,7 +55,7 @@ t1	CREATE TABLE `t1` (
   `i` char(255) DEFAULT NULL,
   PRIMARY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a,b,c,d,e,f,g,h)
+/*!50100 PARTITION BY KEY (a,b,c,d,e,f,g,h)
 (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,
@@ -105,7 +105,7 @@ t1	CREATE TABLE `t1` (
   `i` char(255) DEFAULT NULL,
   PRIMARY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`,`a1`,`b1`,`c1`,`d1`,`e1`,`f1`,`g1`,`h1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1)
+/*!50100 PARTITION BY KEY (a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1)
 (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,
@@ -178,7 +178,7 @@ t1	CREATE TABLE `t1` (
   `i` char(255) DEFAULT NULL,
   PRIMARY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`,`a1`,`b1`,`c1`,`d1`,`e1`,`f1`,`g1`,`h1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a,b,c,d,e,f,g,h)
+/*!50100 PARTITION BY KEY (a,b,c,d,e,f,g,h)
 (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,
diff --git a/mysql-test/suite/parts/r/partition_special_myisam.result b/mysql-test/suite/parts/r/partition_special_myisam.result
index 9c11201733f..bc8036ba861 100644
--- a/mysql-test/suite/parts/r/partition_special_myisam.result
+++ b/mysql-test/suite/parts/r/partition_special_myisam.result
@@ -13,7 +13,7 @@ t1	CREATE TABLE `t1` (
   `d` enum('m','w') NOT NULL DEFAULT 'm',
   PRIMARY KEY (`a`,`b`,`c`,`d`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a,b,c,d)
+/*!50100 PARTITION BY KEY (a,b,c,d)
 (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,
@@ -55,7 +55,7 @@ t1	CREATE TABLE `t1` (
   `i` char(255) DEFAULT NULL,
   PRIMARY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a,b,c,d,e,f,g,h)
+/*!50100 PARTITION BY KEY (a,b,c,d,e,f,g,h)
 (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,
@@ -105,7 +105,7 @@ t1	CREATE TABLE `t1` (
   `i` char(255) DEFAULT NULL,
   PRIMARY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`,`a1`,`b1`,`c1`,`d1`,`e1`,`f1`,`g1`,`h1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1)
+/*!50100 PARTITION BY KEY (a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1)
 (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,
@@ -178,7 +178,7 @@ t1	CREATE TABLE `t1` (
   `i` char(255) DEFAULT NULL,
   PRIMARY KEY (`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`,`a1`,`b1`,`c1`,`d1`,`e1`,`f1`,`g1`,`h1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (a,b,c,d,e,f,g,h)
+/*!50100 PARTITION BY KEY (a,b,c,d,e,f,g,h)
 (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,