Follow-up for MDEV-13089 (identifier quoting in partitioning)

Adjust results for tests in non-default suites

18 files changed, 670 insertions, 670 deletions

diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_analyze.result b/mysql-test/suite/engines/funcs/r/tc_partition_analyze.result
index 852b300332b..884408d29b3 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_analyze.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_analyze.result
@@ -24,13 +24,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 ANALYZE PARTITION p1,p2;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
@@ -48,13 +48,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
diff --git 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
index 805e4637928..93208147dc4 100644
--- 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
@@ -34,7 +34,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -56,7 +56,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -97,7 +97,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -119,7 +119,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -160,7 +160,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -182,7 +182,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -223,7 +223,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -245,7 +245,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -286,7 +286,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -308,7 +308,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -349,7 +349,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 ALTER TABLE t1 COALESCE PARTITION 2;
 SELECT * FROM t1 ORDER BY c1;
@@ -371,7 +371,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
@@ -412,7 +412,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 3
 DROP TABLE t1;
 SHOW TABLES;
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_check.result b/mysql-test/suite/engines/funcs/r/tc_partition_check.result
index f2e10ec2a06..79592633197 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_check.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_check.result
@@ -24,13 +24,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 CHECK PARTITION p1,p2;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
@@ -48,13 +48,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_hash.result b/mysql-test/suite/engines/funcs/r/tc_partition_hash.result
index 8c29eb32d90..e7ac578fbfe 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_hash.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_hash.result
@@ -9,7 +9,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 1
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 3
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 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
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 4
 DROP TABLE t1;
 SHOW TABLES;
@@ -729,7 +729,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -744,7 +744,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -759,7 +759,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -774,7 +774,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -789,7 +789,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -804,7 +804,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -819,7 +819,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -834,7 +834,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -849,7 +849,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -864,7 +864,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -879,7 +879,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -894,7 +894,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 5
 DROP TABLE t1;
 SHOW TABLES;
@@ -909,7 +909,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -924,7 +924,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -939,7 +939,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -954,7 +954,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -969,7 +969,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -984,7 +984,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -999,7 +999,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -1014,7 +1014,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -1029,7 +1029,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -1044,7 +1044,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -1059,7 +1059,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -1074,7 +1074,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 DROP TABLE t1;
 SHOW TABLES;
@@ -1089,7 +1089,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
@@ -1104,7 +1104,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
@@ -1119,7 +1119,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
@@ -1134,7 +1134,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
@@ -1149,7 +1149,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
@@ -1164,7 +1164,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
@@ -1179,7 +1179,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
@@ -1194,7 +1194,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
@@ -1209,7 +1209,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
@@ -1224,7 +1224,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
@@ -1239,7 +1239,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
@@ -1254,7 +1254,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 50
 DROP TABLE t1;
 SHOW TABLES;
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_hash_date_function.result b/mysql-test/suite/engines/funcs/r/tc_partition_hash_date_function.result
index 368ba8c0249..96725b7328a 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_hash_date_function.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_hash_date_function.result
@@ -10,7 +10,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -25,7 +25,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -40,7 +40,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -55,7 +55,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -70,7 +70,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -85,7 +85,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -100,7 +100,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -115,7 +115,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -130,7 +130,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -145,7 +145,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -160,7 +160,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -175,7 +175,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (YEAR(c3))
+ PARTITION BY HASH (year(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -190,7 +190,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -205,7 +205,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -220,7 +220,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -235,7 +235,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -250,7 +250,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -265,7 +265,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -280,7 +280,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -295,7 +295,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -310,7 +310,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -325,7 +325,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -340,7 +340,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -355,7 +355,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (MONTH(c3))
+ PARTITION BY HASH (month(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -370,7 +370,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -385,7 +385,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -400,7 +400,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -415,7 +415,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -430,7 +430,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -445,7 +445,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -460,7 +460,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -475,7 +475,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -490,7 +490,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -505,7 +505,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -520,7 +520,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -535,7 +535,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAY(c3))
+ PARTITION BY HASH (dayofmonth(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -550,7 +550,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -565,7 +565,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -580,7 +580,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -595,7 +595,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -610,7 +610,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -625,7 +625,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -640,7 +640,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -655,7 +655,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -670,7 +670,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -685,7 +685,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -700,7 +700,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
@@ -715,7 +715,7 @@ t2	CREATE TABLE `t2` (
   `c2` char(5) DEFAULT NULL,
   `c3` datetime DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (DAYOFWEEK(c3))
+ PARTITION BY HASH (dayofweek(`c3`))
 DROP TABLE t2;
 SHOW TABLES;
 Tables_in_test
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_key.result b/mysql-test/suite/engines/funcs/r/tc_partition_key.result
index 9ca335be0e2..9286b5d9649 100644
--- 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ PARTITION BY KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_linear_key.result b/mysql-test/suite/engines/funcs/r/tc_partition_linear_key.result
index 0a560743832..2eb32646f9f 100644
--- 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 99
 DROP TABLE t1;
 SHOW TABLES;
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_optimize.result b/mysql-test/suite/engines/funcs/r/tc_partition_optimize.result
index c30705c8194..0eb1143ca47 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_optimize.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_optimize.result
@@ -24,13 +24,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 OPTIMIZE PARTITION p1,p2;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -46,13 +46,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_rebuild.result b/mysql-test/suite/engines/funcs/r/tc_partition_rebuild.result
index bef7ba0635d..9f63c022f36 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_rebuild.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_rebuild.result
@@ -24,13 +24,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 REBUILD PARTITION p1,p2;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -46,13 +46,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_remove.result b/mysql-test/suite/engines/funcs/r/tc_partition_remove.result
index 3ae3439f83c..fcf489d2763 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_remove.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_remove.result
@@ -21,7 +21,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -60,7 +60,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -99,7 +99,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -138,7 +138,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -177,7 +177,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -216,7 +216,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -259,7 +259,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -298,7 +298,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -337,7 +337,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -376,7 +376,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -415,7 +415,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -454,7 +454,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 ALTER TABLE t1 REMOVE PARTITIONING;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_reorg_divide.result b/mysql-test/suite/engines/funcs/r/tc_partition_reorg_divide.result
index 517c16083b3..22463593106 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_reorg_divide.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_reorg_divide.result
@@ -44,12 +44,12 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `s1` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION s2;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION s1;
@@ -71,11 +71,11 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -125,12 +125,12 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `s1` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION s2;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION s1;
@@ -152,11 +152,11 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -206,12 +206,12 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `s1` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION s2;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION s1;
@@ -233,11 +233,11 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -287,12 +287,12 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `s1` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION s2;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION s1;
@@ -314,11 +314,11 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -368,12 +368,12 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `s1` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION s2;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION s1;
@@ -395,11 +395,11 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -449,12 +449,12 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION s1 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `s1` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION s2;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION s1;
@@ -476,11 +476,11 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION s0 VALUES LESS THAN (3) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (20) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `s0` VALUES LESS THAN (3) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (20) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
diff --git 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
index 18f07127cb3..e43e95e928e 100644
--- 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
@@ -19,7 +19,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -41,7 +41,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SHOW TABLES;
@@ -63,7 +63,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -71,7 +71,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -97,7 +97,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -119,7 +119,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -141,7 +141,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -149,7 +149,7 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -175,7 +175,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -197,7 +197,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -219,7 +219,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -227,7 +227,7 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -253,7 +253,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -275,7 +275,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -297,7 +297,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -305,7 +305,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -331,7 +331,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -353,7 +353,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -375,7 +375,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -383,7 +383,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -409,7 +409,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 10
 ALTER TABLE t1 ADD PARTITION PARTITIONS 10;
 SELECT * FROM t1 ORDER BY c1;
@@ -431,7 +431,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 20
 ALTER TABLE t1 COALESCE PARTITION 18;
 SELECT * FROM t1 ORDER BY c1;
@@ -453,7 +453,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -461,7 +461,7 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY HASH (c1)
+ PARTITION BY HASH (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
@@ -487,7 +487,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ 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
- PARTITION BY LINEAR KEY (c1)
+ PARTITION BY LINEAR KEY (`c1`)
 PARTITIONS 2
 DROP TABLE t1;
 SHOW TABLES;
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_reorg_merge.result b/mysql-test/suite/engines/funcs/r/tc_partition_reorg_merge.result
index 618b8dd2465..89681d5ec65 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_reorg_merge.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_reorg_merge.result
@@ -41,10 +41,10 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `m0` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION m1;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION m0;
@@ -63,9 +63,9 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -112,10 +112,10 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `m0` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION m1;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION m0;
@@ -134,9 +134,9 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -183,10 +183,10 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `m0` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION m1;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION m0;
@@ -205,9 +205,9 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -254,10 +254,10 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `m0` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION m1;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION m0;
@@ -276,9 +276,9 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -325,10 +325,10 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `m0` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION m1;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION m0;
@@ -347,9 +347,9 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -396,10 +396,10 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION m0 VALUES LESS THAN (30) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `m0` VALUES LESS THAN (30) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 DROP PARTITION m1;
 ERROR HY000: Error in list of partitions to DROP
 ALTER TABLE t1 DROP PARTITION m0;
@@ -418,9 +418,9 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( c1)
-(PARTITION p0 VALUES LESS THAN (10) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (10) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_repair.result b/mysql-test/suite/engines/funcs/r/tc_partition_repair.result
index 98d9aa93740..d51bd86b715 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_repair.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_repair.result
@@ -24,13 +24,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 ALTER TABLE t1 REPAIR PARTITION p1,p2;
 SELECT * FROM t1 ORDER BY c1;
 c1	c2
@@ -46,13 +46,13 @@ t1	CREATE TABLE `t1` (
   `c2` char(10) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_sub1.result b/mysql-test/suite/engines/funcs/r/tc_partition_sub1.result
index 6d1dc41a354..be47aaadd40 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_sub1.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_sub1.result
@@ -45,12 +45,12 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
 SUBPARTITIONS 2
-(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+(PARTITION `p0` VALUES LESS THAN (1990) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (2000) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -100,12 +100,12 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
 SUBPARTITIONS 2
-(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+(PARTITION `p0` VALUES LESS THAN (1990) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (2000) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -155,12 +155,12 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
 SUBPARTITIONS 2
-(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+(PARTITION `p0` VALUES LESS THAN (1990) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (2000) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -210,12 +210,12 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
 SUBPARTITIONS 2
-(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+(PARTITION `p0` VALUES LESS THAN (1990) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (2000) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -265,12 +265,12 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
 SUBPARTITIONS 2
-(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+(PARTITION `p0` VALUES LESS THAN (1990) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (2000) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -320,12 +320,12 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
 SUBPARTITIONS 2
-(PARTITION p0 VALUES LESS THAN (1990) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (2000) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+(PARTITION `p0` VALUES LESS THAN (1990) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (2000) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_sub2.result b/mysql-test/suite/engines/funcs/r/tc_partition_sub2.result
index c6a0d9aac68..543b3471092 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_sub2.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_sub2.result
@@ -53,17 +53,17 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
-(PARTITION p0 VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
+(PARTITION `p0` VALUES LESS THAN (1990)
+ (SUBPARTITION `s0` ENGINE = ENGINE,
+  SUBPARTITION `s1` ENGINE = ENGINE),
+ PARTITION `p1` VALUES LESS THAN (2000)
+ (SUBPARTITION `s2` ENGINE = ENGINE,
+  SUBPARTITION `s3` ENGINE = ENGINE),
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
+ (SUBPARTITION `s4` ENGINE = ENGINE,
+  SUBPARTITION `s5` ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -121,17 +121,17 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
-(PARTITION p0 VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
+(PARTITION `p0` VALUES LESS THAN (1990)
+ (SUBPARTITION `s0` ENGINE = ENGINE,
+  SUBPARTITION `s1` ENGINE = ENGINE),
+ PARTITION `p1` VALUES LESS THAN (2000)
+ (SUBPARTITION `s2` ENGINE = ENGINE,
+  SUBPARTITION `s3` ENGINE = ENGINE),
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
+ (SUBPARTITION `s4` ENGINE = ENGINE,
+  SUBPARTITION `s5` ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -189,17 +189,17 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
-(PARTITION p0 VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
+(PARTITION `p0` VALUES LESS THAN (1990)
+ (SUBPARTITION `s0` ENGINE = ENGINE,
+  SUBPARTITION `s1` ENGINE = ENGINE),
+ PARTITION `p1` VALUES LESS THAN (2000)
+ (SUBPARTITION `s2` ENGINE = ENGINE,
+  SUBPARTITION `s3` ENGINE = ENGINE),
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
+ (SUBPARTITION `s4` ENGINE = ENGINE,
+  SUBPARTITION `s5` ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -257,17 +257,17 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
-(PARTITION p0 VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
+(PARTITION `p0` VALUES LESS THAN (1990)
+ (SUBPARTITION `s0` ENGINE = ENGINE,
+  SUBPARTITION `s1` ENGINE = ENGINE),
+ PARTITION `p1` VALUES LESS THAN (2000)
+ (SUBPARTITION `s2` ENGINE = ENGINE,
+  SUBPARTITION `s3` ENGINE = ENGINE),
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
+ (SUBPARTITION `s4` ENGINE = ENGINE,
+  SUBPARTITION `s5` ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -325,17 +325,17 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
-(PARTITION p0 VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
+(PARTITION `p0` VALUES LESS THAN (1990)
+ (SUBPARTITION `s0` ENGINE = ENGINE,
+  SUBPARTITION `s1` ENGINE = ENGINE),
+ PARTITION `p1` VALUES LESS THAN (2000)
+ (SUBPARTITION `s2` ENGINE = ENGINE,
+  SUBPARTITION `s3` ENGINE = ENGINE),
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
+ (SUBPARTITION `s4` ENGINE = ENGINE,
+  SUBPARTITION `s5` ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -393,17 +393,17 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
-(PARTITION p0 VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
+(PARTITION `p0` VALUES LESS THAN (1990)
+ (SUBPARTITION `s0` ENGINE = ENGINE,
+  SUBPARTITION `s1` ENGINE = ENGINE),
+ PARTITION `p1` VALUES LESS THAN (2000)
+ (SUBPARTITION `s2` ENGINE = ENGINE,
+  SUBPARTITION `s3` ENGINE = ENGINE),
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
+ (SUBPARTITION `s4` ENGINE = ENGINE,
+  SUBPARTITION `s5` ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_value.result b/mysql-test/suite/engines/funcs/r/tc_partition_value.result
index 98a5f885e4b..48891fc368d 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_value.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_value.result
@@ -15,13 +15,13 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (1991) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (1995) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (1999) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (2002) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (2006) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -41,13 +41,13 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (1991) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (1995) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (1999) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (2002) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (2006) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -67,13 +67,13 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (1991) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (1995) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (1999) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (2002) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (2006) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -93,13 +93,13 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (1991) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (1995) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (1999) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (2002) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (2006) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -119,13 +119,13 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE (c1)
-(PARTITION p0 VALUES LESS THAN (1991) ENGINE = ENGINE,
- PARTITION p1 VALUES LESS THAN (1995) ENGINE = ENGINE,
- PARTITION p2 VALUES LESS THAN (1999) ENGINE = ENGINE,
- PARTITION p3 VALUES LESS THAN (2002) ENGINE = ENGINE,
- PARTITION p4 VALUES LESS THAN (2006) ENGINE = ENGINE,
- PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
+ PARTITION BY RANGE (`c1`)
+(PARTITION `p0` VALUES LESS THAN (1991) ENGINE = ENGINE,
+ PARTITION `p1` VALUES LESS THAN (1995) ENGINE = ENGINE,
+ PARTITION `p2` VALUES LESS THAN (1999) ENGINE = ENGINE,
+ PARTITION `p3` VALUES LESS THAN (2002) ENGINE = ENGINE,
+ PARTITION `p4` VALUES LESS THAN (2006) ENGINE = ENGINE,
+ PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
diff --git a/mysql-test/suite/engines/funcs/r/tc_partition_value_specific.result b/mysql-test/suite/engines/funcs/r/tc_partition_value_specific.result
index 71a38814fd8..0d9393ffeda 100644
--- a/mysql-test/suite/engines/funcs/r/tc_partition_value_specific.result
+++ b/mysql-test/suite/engines/funcs/r/tc_partition_value_specific.result
@@ -13,11 +13,11 @@ t1	CREATE TABLE `t1` (
   `c1` smallint(6) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LIST (c1)
-(PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
- PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
- PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
- PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
+ PARTITION BY LIST (`c1`)
+(PARTITION `r0` VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
+ PARTITION `r1` VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
+ PARTITION `r2` VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
+ PARTITION `r3` VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -35,11 +35,11 @@ t1	CREATE TABLE `t1` (
   `c1` mediumint(9) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LIST (c1)
-(PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
- PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
- PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
- PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
+ PARTITION BY LIST (`c1`)
+(PARTITION `r0` VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
+ PARTITION `r1` VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
+ PARTITION `r2` VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
+ PARTITION `r3` VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -57,11 +57,11 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LIST (c1)
-(PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
- PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
- PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
- PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
+ PARTITION BY LIST (`c1`)
+(PARTITION `r0` VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
+ PARTITION `r1` VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
+ PARTITION `r2` VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
+ PARTITION `r3` VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -79,11 +79,11 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LIST (c1)
-(PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
- PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
- PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
- PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
+ PARTITION BY LIST (`c1`)
+(PARTITION `r0` VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
+ PARTITION `r1` VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
+ PARTITION `r2` VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
+ PARTITION `r3` VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -101,11 +101,11 @@ t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY LIST (c1)
-(PARTITION r0 VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
- PARTITION r1 VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
- PARTITION r2 VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
- PARTITION r3 VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
+ PARTITION BY LIST (`c1`)
+(PARTITION `r0` VALUES IN (1,5,9,13,17,21) ENGINE = ENGINE,
+ PARTITION `r1` VALUES IN (2,6,10,14,18,22) ENGINE = ENGINE,
+ PARTITION `r2` VALUES IN (3,7,11,15,19,23) ENGINE = ENGINE,
+ PARTITION `r3` VALUES IN (4,8,12,16,20,24) ENGINE = ENGINE)
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test