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

Adjust results for tests in non-default suites

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

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

@@ -34,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;

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

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

@@ -9,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;

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

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;

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;

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

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

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

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

@@ -21,7 +21,7 @@ t1	CREATE TABLE `t1` (
   `c1` tinyint(4) DEFAULT NULL,
   `c2` char(5) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- 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

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

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

@@ -19,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;

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

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

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

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

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

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

@@ -53,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))
+ PARTITION BY RANGE (year(`purchased`))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
+SUBPARTITION BY HASH (to_days(`purchased`))
-(PARTITION p0 VALUES LESS THAN (1990)
+(PARTITION `p0` VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
+ (SUBPARTITION `s0` ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
+  SUBPARTITION `s1` ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
+ PARTITION `p1` VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
+ (SUBPARTITION `s2` ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
+  SUBPARTITION `s3` ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
+ (SUBPARTITION `s4` ENGINE = ENGINE,
-  SUBPARTITION s5 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))
+ PARTITION BY RANGE (year(`purchased`))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
+SUBPARTITION BY HASH (to_days(`purchased`))
-(PARTITION p0 VALUES LESS THAN (1990)
+(PARTITION `p0` VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
+ (SUBPARTITION `s0` ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
+  SUBPARTITION `s1` ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
+ PARTITION `p1` VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
+ (SUBPARTITION `s2` ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
+  SUBPARTITION `s3` ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
+ (SUBPARTITION `s4` ENGINE = ENGINE,
-  SUBPARTITION s5 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))
+ PARTITION BY RANGE (year(`purchased`))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
+SUBPARTITION BY HASH (to_days(`purchased`))
-(PARTITION p0 VALUES LESS THAN (1990)
+(PARTITION `p0` VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
+ (SUBPARTITION `s0` ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
+  SUBPARTITION `s1` ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
+ PARTITION `p1` VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
+ (SUBPARTITION `s2` ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
+  SUBPARTITION `s3` ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
+ (SUBPARTITION `s4` ENGINE = ENGINE,
-  SUBPARTITION s5 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))
+ PARTITION BY RANGE (year(`purchased`))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
+SUBPARTITION BY HASH (to_days(`purchased`))
-(PARTITION p0 VALUES LESS THAN (1990)
+(PARTITION `p0` VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
+ (SUBPARTITION `s0` ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
+  SUBPARTITION `s1` ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
+ PARTITION `p1` VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
+ (SUBPARTITION `s2` ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
+  SUBPARTITION `s3` ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
+ (SUBPARTITION `s4` ENGINE = ENGINE,
-  SUBPARTITION s5 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))
+ PARTITION BY RANGE (year(`purchased`))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
+SUBPARTITION BY HASH (to_days(`purchased`))
-(PARTITION p0 VALUES LESS THAN (1990)
+(PARTITION `p0` VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
+ (SUBPARTITION `s0` ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
+  SUBPARTITION `s1` ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
+ PARTITION `p1` VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
+ (SUBPARTITION `s2` ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
+  SUBPARTITION `s3` ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
+ (SUBPARTITION `s4` ENGINE = ENGINE,
-  SUBPARTITION s5 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))
+ PARTITION BY RANGE (year(`purchased`))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
+SUBPARTITION BY HASH (to_days(`purchased`))
-(PARTITION p0 VALUES LESS THAN (1990)
+(PARTITION `p0` VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
+ (SUBPARTITION `s0` ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
+  SUBPARTITION `s1` ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
+ PARTITION `p1` VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
+ (SUBPARTITION `s2` ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
+  SUBPARTITION `s3` ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
+ (SUBPARTITION `s4` ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE))
+  SUBPARTITION `s5` ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test

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

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

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

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

storage/tokudb/mysql-test/tokudb_parts/r/part_supported_sql_func_tokudb.result

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

storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_tokudb.result

@@ -393,7 +393,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -885,7 +885,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -1385,15 +1385,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (`f_int1` % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1890,13 +1890,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2389,13 +2389,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (`f_int1` DIV 2)
-SUBPARTITION BY HASH (f_int1)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2894,20 +2894,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3404,20 +3404,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int1 + 1)
+SUBPARTITION BY HASH (`f_int1` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3912,12 +3912,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -4409,7 +4409,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -4901,7 +4901,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -5401,15 +5401,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (`f_int1` % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5906,13 +5906,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6405,13 +6405,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (`f_int1` DIV 2)
-SUBPARTITION BY HASH (f_int1)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6910,20 +6910,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7420,20 +7420,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int1 + 1)
+SUBPARTITION BY HASH (`f_int1` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7928,12 +7928,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -8426,7 +8426,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -8934,7 +8934,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -9450,15 +9450,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (`f_int1` % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9971,13 +9971,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10486,13 +10486,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (`f_int1` DIV 2)
-SUBPARTITION BY HASH (f_int1)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11007,20 +11007,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11533,20 +11533,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int1 + 1)
+SUBPARTITION BY HASH (`f_int1` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12057,12 +12057,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -12570,7 +12570,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -13078,7 +13078,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -13594,15 +13594,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (`f_int1` % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14115,13 +14115,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14630,13 +14630,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (`f_int1` DIV 2)
-SUBPARTITION BY HASH (f_int1)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15151,20 +15151,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15677,20 +15677,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int1 + 1)
+SUBPARTITION BY HASH (`f_int1` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16201,12 +16201,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1

storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_1_tokudb.result

@@ -74,7 +74,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -530,7 +530,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -994,15 +994,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (`f_int1` % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1463,13 +1463,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1926,13 +1926,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (`f_int1` DIV 2)
-SUBPARTITION BY HASH (f_int1)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2395,20 +2395,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2869,20 +2869,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int1 + 1)
+SUBPARTITION BY HASH (`f_int1` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3341,12 +3341,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3804,7 +3804,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -4298,7 +4298,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -4800,15 +4800,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (`f_int1` % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5307,13 +5307,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5808,13 +5808,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (`f_int1` DIV 2)
-SUBPARTITION BY HASH (f_int1)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6315,20 +6315,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6827,20 +6827,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int1 + 1)
+SUBPARTITION BY HASH (`f_int1` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7337,12 +7337,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7836,7 +7836,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -8330,7 +8330,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -8832,15 +8832,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (`f_int1` % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9339,13 +9339,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9840,13 +9840,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (`f_int1` DIV 2)
-SUBPARTITION BY HASH (f_int1)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10347,20 +10347,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10859,20 +10859,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int1 + 1)
+SUBPARTITION BY HASH (`f_int1` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11369,12 +11369,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11869,7 +11869,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -12377,7 +12377,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -12893,15 +12893,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (`f_int1` % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13414,13 +13414,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13929,13 +13929,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (`f_int1` DIV 2)
-SUBPARTITION BY HASH (f_int1)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14450,20 +14450,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14976,20 +14976,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int1 + 1)
+SUBPARTITION BY HASH (`f_int1` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15500,12 +15500,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16013,7 +16013,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -16521,7 +16521,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -17037,15 +17037,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (`f_int1` % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17558,13 +17558,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18073,13 +18073,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (`f_int1` DIV 2)
-SUBPARTITION BY HASH (f_int1)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18594,20 +18594,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19120,20 +19120,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int1 + 1)
+SUBPARTITION BY HASH (`f_int1` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19644,12 +19644,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1

storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_2_tokudb.result

@@ -70,7 +70,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -526,7 +526,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -990,15 +990,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1459,13 +1459,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1922,13 +1922,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY HASH (f_int2)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2389,20 +2389,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int2)
+SUBPARTITION BY KEY (`f_int2`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2863,20 +2863,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int2 + 1)
+SUBPARTITION BY HASH (`f_int2` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3335,12 +3335,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int2)
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3798,7 +3798,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -4293,7 +4293,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -4796,15 +4796,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5304,13 +5304,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5806,13 +5806,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY HASH (f_int2)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6312,20 +6312,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int2)
+SUBPARTITION BY KEY (`f_int2`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6825,20 +6825,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int2 + 1)
+SUBPARTITION BY HASH (`f_int2` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7336,12 +7336,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int2)
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7836,7 +7836,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -8331,7 +8331,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -8834,15 +8834,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9342,13 +9342,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9844,13 +9844,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY HASH (f_int2)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10350,20 +10350,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int2)
+SUBPARTITION BY KEY (`f_int2`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10863,20 +10863,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int2 + 1)
+SUBPARTITION BY HASH (`f_int2` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11374,12 +11374,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int2)
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11875,7 +11875,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -12383,7 +12383,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -12899,15 +12899,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13420,13 +13420,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13935,13 +13935,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY HASH (f_int2)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14454,20 +14454,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int2)
+SUBPARTITION BY KEY (`f_int2`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14980,20 +14980,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int2 + 1)
+SUBPARTITION BY HASH (`f_int2` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15504,12 +15504,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int2)
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16017,7 +16017,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -16525,7 +16525,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -17041,15 +17041,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17562,13 +17562,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18077,13 +18077,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY HASH (f_int2)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18596,20 +18596,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int2)
+SUBPARTITION BY KEY (`f_int2`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19122,20 +19122,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int2 + 1)
+SUBPARTITION BY HASH (`f_int2` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19646,12 +19646,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int2)
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1

storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_1_tokudb.result

@@ -74,7 +74,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -532,7 +532,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -998,15 +998,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (`f_int1` % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1469,13 +1469,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1932,13 +1932,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (`f_int1` DIV 2)
-SUBPARTITION BY HASH (f_int1)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2403,20 +2403,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2877,20 +2877,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int1 + 1)
+SUBPARTITION BY HASH (`f_int1` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3351,12 +3351,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3815,7 +3815,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -4311,7 +4311,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -4815,15 +4815,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (`f_int1` % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5324,13 +5324,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5825,13 +5825,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (`f_int1` DIV 2)
-SUBPARTITION BY HASH (f_int1)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6334,20 +6334,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6846,20 +6846,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int1 + 1)
+SUBPARTITION BY HASH (`f_int1` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7358,12 +7358,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7859,7 +7859,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -8355,7 +8355,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -8859,15 +8859,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (`f_int1` % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9368,13 +9368,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9869,13 +9869,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (`f_int1` DIV 2)
-SUBPARTITION BY HASH (f_int1)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10378,20 +10378,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10890,20 +10890,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int1 + 1)
+SUBPARTITION BY HASH (`f_int1` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11402,12 +11402,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11904,7 +11904,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -12414,7 +12414,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -12932,15 +12932,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (`f_int1` % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13455,13 +13455,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13970,13 +13970,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (`f_int1` DIV 2)
-SUBPARTITION BY HASH (f_int1)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14493,20 +14493,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15019,20 +15019,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int1 + 1)
+SUBPARTITION BY HASH (`f_int1` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15545,12 +15545,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16060,7 +16060,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1)
+ PARTITION BY HASH (`f_int1`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -16570,7 +16570,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1)
+ PARTITION BY KEY (`f_int1`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -17088,15 +17088,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1,4))
+ PARTITION BY LIST (`f_int1` % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17611,13 +17611,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18126,13 +18126,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1 DIV 2)
+ PARTITION BY RANGE (`f_int1` DIV 2)
-SUBPARTITION BY HASH (f_int1)
+SUBPARTITION BY HASH (`f_int1`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18649,20 +18649,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19175,20 +19175,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int1 + 1)
+SUBPARTITION BY HASH (`f_int1` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19701,12 +19701,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int1)
+SUBPARTITION BY KEY (`f_int1`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1

storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_2_tokudb.result

@@ -69,7 +69,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -528,7 +528,7 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -995,15 +995,15 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1467,13 +1467,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -1935,13 +1935,13 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY HASH (f_int2)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2407,20 +2407,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int2)
+SUBPARTITION BY KEY (`f_int2`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -2886,20 +2886,20 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int2 + 1)
+SUBPARTITION BY HASH (`f_int2` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3361,12 +3361,12 @@ t1	CREATE TABLE `t1` (
   `f_char2` char(20) DEFAULT NULL,
   `f_charbig` varchar(1000) DEFAULT NULL
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int2)
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -3827,7 +3827,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -4325,7 +4325,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -4831,15 +4831,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5342,13 +5342,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -5849,13 +5849,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY HASH (f_int2)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6360,20 +6360,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int2)
+SUBPARTITION BY KEY (`f_int2`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -6878,20 +6878,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int2 + 1)
+SUBPARTITION BY HASH (`f_int2` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7392,12 +7392,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int2)
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -7895,7 +7895,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -8393,7 +8393,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -8899,15 +8899,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9410,13 +9410,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -9917,13 +9917,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY HASH (f_int2)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10428,20 +10428,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int2)
+SUBPARTITION BY KEY (`f_int2`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -10946,20 +10946,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int2 + 1)
+SUBPARTITION BY HASH (`f_int2` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11460,12 +11460,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   PRIMARY KEY (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int2)
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -11964,7 +11964,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -12475,7 +12475,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -12994,15 +12994,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -13518,13 +13518,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14038,13 +14038,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY HASH (f_int2)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -14562,20 +14562,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int2)
+SUBPARTITION BY KEY (`f_int2`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15093,20 +15093,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int2 + 1)
+SUBPARTITION BY HASH (`f_int2` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -15620,12 +15620,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int2)
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -16136,7 +16136,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY HASH (f_int1 + f_int2)
+ PARTITION BY HASH (`f_int1` + `f_int2`)
 PARTITIONS 2
 
 # check prerequisites-1 success:    1
@@ -16647,7 +16647,7 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY KEY (f_int1,f_int2)
+ PARTITION BY KEY (`f_int1`,`f_int2`)
 PARTITIONS 5
 
 # check prerequisites-1 success:    1
@@ -17166,15 +17166,15 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (MOD(f_int1 + f_int2,4))
+ PARTITION BY LIST ((`f_int1` + `f_int2`) % 4)
-(PARTITION part_3 VALUES IN (-3) ENGINE = TokuDB,
+(PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB,
- PARTITION part_2 VALUES IN (-2) ENGINE = TokuDB,
+ PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB,
- PARTITION part_1 VALUES IN (-1) ENGINE = TokuDB,
+ PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB,
- PARTITION part_N VALUES IN (NULL) ENGINE = TokuDB,
+ PARTITION `part_N` VALUES IN (NULL) ENGINE = TokuDB,
- PARTITION part0 VALUES IN (0) ENGINE = TokuDB,
+ PARTITION `part0` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part1 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part1` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (2) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (2) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (3) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (3) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -17690,13 +17690,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE ((f_int1 + f_int2) DIV 2)
+ PARTITION BY RANGE ((`f_int1` + `f_int2`) DIV 2)
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (15) ENGINE = TokuDB,
+ PARTITION `partd` VALUES LESS THAN (15) ENGINE = TokuDB,
- PARTITION parte VALUES LESS THAN (20) ENGINE = TokuDB,
+ PARTITION `parte` VALUES LESS THAN (20) ENGINE = TokuDB,
- PARTITION partf VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partf` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18210,13 +18210,13 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY HASH (f_int2)
+SUBPARTITION BY HASH (`f_int2`)
 SUBPARTITIONS 2
-(PARTITION parta VALUES LESS THAN (0) ENGINE = TokuDB,
+(PARTITION `parta` VALUES LESS THAN (0) ENGINE = TokuDB,
- PARTITION partb VALUES LESS THAN (5) ENGINE = TokuDB,
+ PARTITION `partb` VALUES LESS THAN (5) ENGINE = TokuDB,
- PARTITION partc VALUES LESS THAN (10) ENGINE = TokuDB,
+ PARTITION `partc` VALUES LESS THAN (10) ENGINE = TokuDB,
- PARTITION partd VALUES LESS THAN (2147483646) ENGINE = TokuDB)
+ PARTITION `partd` VALUES LESS THAN (2147483646) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -18734,20 +18734,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY RANGE (f_int1)
+ PARTITION BY RANGE (`f_int1`)
-SUBPARTITION BY KEY (f_int2)
+SUBPARTITION BY KEY (`f_int2`)
-(PARTITION part1 VALUES LESS THAN (0)
+(PARTITION `part1` VALUES LESS THAN (0)
- (SUBPARTITION subpart11 ENGINE = TokuDB,
+ (SUBPARTITION `subpart11` ENGINE = TokuDB,
-  SUBPARTITION subpart12 ENGINE = TokuDB),
+  SUBPARTITION `subpart12` ENGINE = TokuDB),
- PARTITION part2 VALUES LESS THAN (5)
+ PARTITION `part2` VALUES LESS THAN (5)
- (SUBPARTITION subpart21 ENGINE = TokuDB,
+ (SUBPARTITION `subpart21` ENGINE = TokuDB,
-  SUBPARTITION subpart22 ENGINE = TokuDB),
+  SUBPARTITION `subpart22` ENGINE = TokuDB),
- PARTITION part3 VALUES LESS THAN (10)
+ PARTITION `part3` VALUES LESS THAN (10)
- (SUBPARTITION subpart31 ENGINE = TokuDB,
+ (SUBPARTITION `subpart31` ENGINE = TokuDB,
-  SUBPARTITION subpart32 ENGINE = TokuDB),
+  SUBPARTITION `subpart32` ENGINE = TokuDB),
- PARTITION part4 VALUES LESS THAN (2147483646)
+ PARTITION `part4` VALUES LESS THAN (2147483646)
- (SUBPARTITION subpart41 ENGINE = TokuDB,
+ (SUBPARTITION `subpart41` ENGINE = TokuDB,
-  SUBPARTITION subpart42 ENGINE = TokuDB))
+  SUBPARTITION `subpart42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19265,20 +19265,20 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,3)))
+ PARTITION BY LIST (abs(`f_int1` % 3))
-SUBPARTITION BY HASH (f_int2 + 1)
+SUBPARTITION BY HASH (`f_int2` + 1)
-(PARTITION part1 VALUES IN (0)
+(PARTITION `part1` VALUES IN (0)
- (SUBPARTITION sp11 ENGINE = TokuDB,
+ (SUBPARTITION `sp11` ENGINE = TokuDB,
-  SUBPARTITION sp12 ENGINE = TokuDB),
+  SUBPARTITION `sp12` ENGINE = TokuDB),
- PARTITION part2 VALUES IN (1)
+ PARTITION `part2` VALUES IN (1)
- (SUBPARTITION sp21 ENGINE = TokuDB,
+ (SUBPARTITION `sp21` ENGINE = TokuDB,
-  SUBPARTITION sp22 ENGINE = TokuDB),
+  SUBPARTITION `sp22` ENGINE = TokuDB),
- PARTITION part3 VALUES IN (2)
+ PARTITION `part3` VALUES IN (2)
- (SUBPARTITION sp31 ENGINE = TokuDB,
+ (SUBPARTITION `sp31` ENGINE = TokuDB,
-  SUBPARTITION sp32 ENGINE = TokuDB),
+  SUBPARTITION `sp32` ENGINE = TokuDB),
- PARTITION part4 VALUES IN (NULL)
+ PARTITION `part4` VALUES IN (NULL)
- (SUBPARTITION sp41 ENGINE = TokuDB,
+ (SUBPARTITION `sp41` ENGINE = TokuDB,
-  SUBPARTITION sp42 ENGINE = TokuDB))
+  SUBPARTITION `sp42` ENGINE = TokuDB))
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1
@@ -19792,12 +19792,12 @@ t1	CREATE TABLE `t1` (
   `f_charbig` varchar(1000) DEFAULT NULL,
   UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
- PARTITION BY LIST (ABS(MOD(f_int1,2)))
+ PARTITION BY LIST (abs(`f_int1` % 2))
-SUBPARTITION BY KEY (f_int2)
+SUBPARTITION BY KEY (`f_int2`)
 SUBPARTITIONS 3
-(PARTITION part1 VALUES IN (0) ENGINE = TokuDB,
+(PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,
- PARTITION part2 VALUES IN (1) ENGINE = TokuDB,
+ PARTITION `part2` VALUES IN (1) ENGINE = TokuDB,
- PARTITION part3 VALUES IN (NULL) ENGINE = TokuDB)
+ PARTITION `part3` VALUES IN (NULL) ENGINE = TokuDB)
 
 # check prerequisites-1 success:    1
 # check COUNT(*) success:    1