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.
2026-01-06 05:22:24 +03:00 · 2013-02-14 17:03:49 +01:00
parent c0333739cc
commit 89681f6dc6
64 changed files with 868 additions and 813 deletions
--- a/mysql-test/suite/engines/funcs/r/tc_partition_change_from_range_to_hash_key.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_change_from_range_to_hash_key.result
@@ -412,7 +412,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 5 */
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -434,7 +434,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 3 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -475,7 +475,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 5 */
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -497,7 +497,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 3 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -538,7 +538,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 5 */
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -560,7 +560,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 3 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -601,7 +601,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 5 */
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -623,7 +623,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 3 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -664,7 +664,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 5 */
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -686,7 +686,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 3 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -727,7 +727,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 5 */
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -749,7 +749,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 3 */
 DROP TABLE t1;
 SHOW TABLES;
--- a/mysql-test/suite/engines/funcs/r/tc_partition_key.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_key.result
@@ -9,7 +9,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -24,7 +24,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -39,7 +39,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -54,7 +54,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -69,7 +69,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -84,7 +84,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -99,7 +99,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -114,7 +114,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -129,7 +129,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -144,7 +144,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -159,7 +159,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -174,7 +174,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -189,7 +189,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -204,7 +204,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -219,7 +219,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -234,7 +234,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -249,7 +249,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -264,7 +264,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -279,7 +279,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -294,7 +294,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -309,7 +309,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -324,7 +324,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -339,7 +339,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -354,7 +354,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -369,7 +369,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -384,7 +384,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -399,7 +399,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -414,7 +414,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -429,7 +429,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -444,7 +444,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -459,7 +459,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -474,7 +474,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -489,7 +489,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -504,7 +504,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -519,7 +519,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -534,7 +534,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -549,7 +549,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -564,7 +564,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -579,7 +579,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -594,7 +594,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -609,7 +609,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -624,7 +624,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -639,7 +639,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -654,7 +654,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -669,7 +669,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -684,7 +684,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -699,7 +699,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -714,7 +714,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
--- a/mysql-test/suite/engines/funcs/r/tc_partition_linear_key.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_linear_key.result
@@ -9,7 +9,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -24,7 +24,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -39,7 +39,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -54,7 +54,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -69,7 +69,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -84,7 +84,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -99,7 +99,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -114,7 +114,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -129,7 +129,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -144,7 +144,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -159,7 +159,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -174,7 +174,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -189,7 +189,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -204,7 +204,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -219,7 +219,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -234,7 +234,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -249,7 +249,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -264,7 +264,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -279,7 +279,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -294,7 +294,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -309,7 +309,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -324,7 +324,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -339,7 +339,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -354,7 +354,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 4 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -369,7 +369,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -384,7 +384,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -399,7 +399,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -414,7 +414,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -429,7 +429,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -444,7 +444,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -459,7 +459,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -474,7 +474,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -489,7 +489,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -504,7 +504,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -519,7 +519,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -534,7 +534,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 5 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -549,7 +549,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -564,7 +564,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -579,7 +579,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -594,7 +594,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -609,7 +609,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -624,7 +624,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) DEFAULT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -639,7 +639,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -654,7 +654,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -669,7 +669,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -684,7 +684,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -699,7 +699,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -714,7 +714,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 99 */
 DROP TABLE t1;
 SHOW TABLES;
--- a/mysql-test/suite/engines/funcs/r/tc_partition_reorg_hash_key.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_reorg_hash_key.result
@@ -487,7 +487,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 10 */
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -509,7 +509,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 20 */
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -531,7 +531,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -539,7 +539,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -565,7 +565,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 10 */
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -587,7 +587,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 20 */
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -609,7 +609,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -617,7 +617,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -643,7 +643,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 10 */
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -665,7 +665,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 20 */
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -687,7 +687,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -695,7 +695,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -721,7 +721,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 10 */
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -743,7 +743,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 20 */
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -765,7 +765,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -773,7 +773,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -799,7 +799,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 10 */
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -821,7 +821,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 20 */
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -843,7 +843,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -851,7 +851,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -877,7 +877,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 10 */
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -899,7 +899,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 20 */
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -921,7 +921,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -929,7 +929,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -955,7 +955,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 10 */
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -977,7 +977,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 20 */
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -999,7 +999,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -1007,7 +1007,7 @@ t1	CREATE TABLE `t1` (
  `c1` tinyint(4) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -1033,7 +1033,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 10 */
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -1055,7 +1055,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 20 */
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -1077,7 +1077,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -1085,7 +1085,7 @@ t1	CREATE TABLE `t1` (
  `c1` smallint(6) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -1111,7 +1111,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 10 */
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -1133,7 +1133,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 20 */
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -1155,7 +1155,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -1163,7 +1163,7 @@ t1	CREATE TABLE `t1` (
  `c1` mediumint(9) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -1189,7 +1189,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 10 */
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -1211,7 +1211,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 20 */
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -1233,7 +1233,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -1241,7 +1241,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -1267,7 +1267,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 10 */
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -1289,7 +1289,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 20 */
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -1311,7 +1311,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -1319,7 +1319,7 @@ t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;
@@ -1345,7 +1345,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 10 */
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -1367,7 +1367,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 20 */
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -1389,7 +1389,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -1397,7 +1397,7 @@ t1	CREATE TABLE `t1` (
  `c1` bigint(20) NOT NULL,
  `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
-/*!50100 PARTITION BY LINEAR KEY ALGORITHM = 2 (c1)
+/*!50100 PARTITION BY LINEAR KEY (c1)
 PARTITIONS 2 */
 DROP TABLE t1;
 SHOW TABLES;