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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -53,17 +53,17 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
-(PARTITION p0 VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
+(PARTITION `p0` VALUES LESS THAN (1990)
+ (SUBPARTITION `s0` ENGINE = ENGINE,
+  SUBPARTITION `s1` ENGINE = ENGINE),
+ PARTITION `p1` VALUES LESS THAN (2000)
+ (SUBPARTITION `s2` ENGINE = ENGINE,
+  SUBPARTITION `s3` ENGINE = ENGINE),
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
+ (SUBPARTITION `s4` ENGINE = ENGINE,
+  SUBPARTITION `s5` ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -121,17 +121,17 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
-(PARTITION p0 VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
+(PARTITION `p0` VALUES LESS THAN (1990)
+ (SUBPARTITION `s0` ENGINE = ENGINE,
+  SUBPARTITION `s1` ENGINE = ENGINE),
+ PARTITION `p1` VALUES LESS THAN (2000)
+ (SUBPARTITION `s2` ENGINE = ENGINE,
+  SUBPARTITION `s3` ENGINE = ENGINE),
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
+ (SUBPARTITION `s4` ENGINE = ENGINE,
+  SUBPARTITION `s5` ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -189,17 +189,17 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
-(PARTITION p0 VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
+(PARTITION `p0` VALUES LESS THAN (1990)
+ (SUBPARTITION `s0` ENGINE = ENGINE,
+  SUBPARTITION `s1` ENGINE = ENGINE),
+ PARTITION `p1` VALUES LESS THAN (2000)
+ (SUBPARTITION `s2` ENGINE = ENGINE,
+  SUBPARTITION `s3` ENGINE = ENGINE),
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
+ (SUBPARTITION `s4` ENGINE = ENGINE,
+  SUBPARTITION `s5` ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -257,17 +257,17 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
-(PARTITION p0 VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
+(PARTITION `p0` VALUES LESS THAN (1990)
+ (SUBPARTITION `s0` ENGINE = ENGINE,
+  SUBPARTITION `s1` ENGINE = ENGINE),
+ PARTITION `p1` VALUES LESS THAN (2000)
+ (SUBPARTITION `s2` ENGINE = ENGINE,
+  SUBPARTITION `s3` ENGINE = ENGINE),
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
+ (SUBPARTITION `s4` ENGINE = ENGINE,
+  SUBPARTITION `s5` ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -325,17 +325,17 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
-(PARTITION p0 VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
+(PARTITION `p0` VALUES LESS THAN (1990)
+ (SUBPARTITION `s0` ENGINE = ENGINE,
+  SUBPARTITION `s1` ENGINE = ENGINE),
+ PARTITION `p1` VALUES LESS THAN (2000)
+ (SUBPARTITION `s2` ENGINE = ENGINE,
+  SUBPARTITION `s3` ENGINE = ENGINE),
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
+ (SUBPARTITION `s4` ENGINE = ENGINE,
+  SUBPARTITION `s5` ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test
@@ -393,17 +393,17 @@ t1	CREATE TABLE `t1` (
   `name` varchar(30) DEFAULT NULL,
   `purchased` date DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
- PARTITION BY RANGE ( YEAR(purchased))
-SUBPARTITION BY HASH ( TO_DAYS(purchased))
-(PARTITION p0 VALUES LESS THAN (1990)
- (SUBPARTITION s0 ENGINE = ENGINE,
-  SUBPARTITION s1 ENGINE = ENGINE),
- PARTITION p1 VALUES LESS THAN (2000)
- (SUBPARTITION s2 ENGINE = ENGINE,
-  SUBPARTITION s3 ENGINE = ENGINE),
- PARTITION p2 VALUES LESS THAN MAXVALUE
- (SUBPARTITION s4 ENGINE = ENGINE,
-  SUBPARTITION s5 ENGINE = ENGINE))
+ PARTITION BY RANGE (year(`purchased`))
+SUBPARTITION BY HASH (to_days(`purchased`))
+(PARTITION `p0` VALUES LESS THAN (1990)
+ (SUBPARTITION `s0` ENGINE = ENGINE,
+  SUBPARTITION `s1` ENGINE = ENGINE),
+ PARTITION `p1` VALUES LESS THAN (2000)
+ (SUBPARTITION `s2` ENGINE = ENGINE,
+  SUBPARTITION `s3` ENGINE = ENGINE),
+ PARTITION `p2` VALUES LESS THAN MAXVALUE
+ (SUBPARTITION `s4` ENGINE = ENGINE,
+  SUBPARTITION `s5` ENGINE = ENGINE))
 DROP TABLE t1;
 SHOW TABLES;
 Tables_in_test

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

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

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

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