Skip to content

Commit 93e32d7

Browse files
elenstelenst
committed
Follow-up for MDEV-13089 (identifier quoting in partitioning)
Adjust results for tests in non-default suites
1 parent 970719c commit 93e32d7

29 files changed

+5738
-5738
lines changed

‎mysql-test/suite/engines/funcs/r/tc_partition_analyze.result

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ t1 CREATE TABLE `t1` (
2424
`c2` char(10) DEFAULT NULL,
2525
PRIMARY KEY (`c1`)
2626
) ENGINE=ENGINE DEFAULT CHARSET=latin1
27-
PARTITION BY RANGE (c1)
28-
(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
29-
PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
30-
PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
31-
PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
32-
PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
33-
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
27+
PARTITION BY RANGE (`c1`)
28+
(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
29+
PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
30+
PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
31+
PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
32+
PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
33+
PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
3434
ALTER TABLE t1 ANALYZE PARTITION p1,p2;
3535
Table Op Msg_type Msg_text
3636
test.t1 analyze status OK
@@ -48,13 +48,13 @@ t1 CREATE TABLE `t1` (
4848
`c2` char(10) DEFAULT NULL,
4949
PRIMARY KEY (`c1`)
5050
) ENGINE=ENGINE DEFAULT CHARSET=latin1
51-
PARTITION BY RANGE (c1)
52-
(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
53-
PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
54-
PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
55-
PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
56-
PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
57-
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
51+
PARTITION BY RANGE (`c1`)
52+
(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
53+
PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
54+
PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
55+
PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
56+
PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
57+
PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
5858
DROP TABLE t1;
5959
SHOW TABLES;
6060
Tables_in_test

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ t1 CREATE TABLE `t1` (
3434
`c1` tinyint(4) NOT NULL,
3535
`c2` char(5) DEFAULT NULL
3636
) ENGINE=ENGINE DEFAULT CHARSET=latin1
37-
PARTITION BY HASH (c1)
37+
PARTITION BY HASH (`c1`)
3838
PARTITIONS 5
3939
ALTER TABLE t1 COALESCE PARTITION 2;
4040
SELECT * FROM t1 ORDER BY c1;
@@ -56,7 +56,7 @@ t1 CREATE TABLE `t1` (
5656
`c1` tinyint(4) NOT NULL,
5757
`c2` char(5) DEFAULT NULL
5858
) ENGINE=ENGINE DEFAULT CHARSET=latin1
59-
PARTITION BY HASH (c1)
59+
PARTITION BY HASH (`c1`)
6060
PARTITIONS 3
6161
DROP TABLE t1;
6262
SHOW TABLES;
@@ -97,7 +97,7 @@ t1 CREATE TABLE `t1` (
9797
`c1` smallint(6) NOT NULL,
9898
`c2` char(5) DEFAULT NULL
9999
) ENGINE=ENGINE DEFAULT CHARSET=latin1
100-
PARTITION BY HASH (c1)
100+
PARTITION BY HASH (`c1`)
101101
PARTITIONS 5
102102
ALTER TABLE t1 COALESCE PARTITION 2;
103103
SELECT * FROM t1 ORDER BY c1;
@@ -119,7 +119,7 @@ t1 CREATE TABLE `t1` (
119119
`c1` smallint(6) NOT NULL,
120120
`c2` char(5) DEFAULT NULL
121121
) ENGINE=ENGINE DEFAULT CHARSET=latin1
122-
PARTITION BY HASH (c1)
122+
PARTITION BY HASH (`c1`)
123123
PARTITIONS 3
124124
DROP TABLE t1;
125125
SHOW TABLES;
@@ -160,7 +160,7 @@ t1 CREATE TABLE `t1` (
160160
`c1` mediumint(9) NOT NULL,
161161
`c2` char(5) DEFAULT NULL
162162
) ENGINE=ENGINE DEFAULT CHARSET=latin1
163-
PARTITION BY HASH (c1)
163+
PARTITION BY HASH (`c1`)
164164
PARTITIONS 5
165165
ALTER TABLE t1 COALESCE PARTITION 2;
166166
SELECT * FROM t1 ORDER BY c1;
@@ -182,7 +182,7 @@ t1 CREATE TABLE `t1` (
182182
`c1` mediumint(9) NOT NULL,
183183
`c2` char(5) DEFAULT NULL
184184
) ENGINE=ENGINE DEFAULT CHARSET=latin1
185-
PARTITION BY HASH (c1)
185+
PARTITION BY HASH (`c1`)
186186
PARTITIONS 3
187187
DROP TABLE t1;
188188
SHOW TABLES;
@@ -223,7 +223,7 @@ t1 CREATE TABLE `t1` (
223223
`c1` int(11) NOT NULL,
224224
`c2` char(5) DEFAULT NULL
225225
) ENGINE=ENGINE DEFAULT CHARSET=latin1
226-
PARTITION BY HASH (c1)
226+
PARTITION BY HASH (`c1`)
227227
PARTITIONS 5
228228
ALTER TABLE t1 COALESCE PARTITION 2;
229229
SELECT * FROM t1 ORDER BY c1;
@@ -245,7 +245,7 @@ t1 CREATE TABLE `t1` (
245245
`c1` int(11) NOT NULL,
246246
`c2` char(5) DEFAULT NULL
247247
) ENGINE=ENGINE DEFAULT CHARSET=latin1
248-
PARTITION BY HASH (c1)
248+
PARTITION BY HASH (`c1`)
249249
PARTITIONS 3
250250
DROP TABLE t1;
251251
SHOW TABLES;
@@ -286,7 +286,7 @@ t1 CREATE TABLE `t1` (
286286
`c1` int(11) NOT NULL,
287287
`c2` char(5) DEFAULT NULL
288288
) ENGINE=ENGINE DEFAULT CHARSET=latin1
289-
PARTITION BY HASH (c1)
289+
PARTITION BY HASH (`c1`)
290290
PARTITIONS 5
291291
ALTER TABLE t1 COALESCE PARTITION 2;
292292
SELECT * FROM t1 ORDER BY c1;
@@ -308,7 +308,7 @@ t1 CREATE TABLE `t1` (
308308
`c1` int(11) NOT NULL,
309309
`c2` char(5) DEFAULT NULL
310310
) ENGINE=ENGINE DEFAULT CHARSET=latin1
311-
PARTITION BY HASH (c1)
311+
PARTITION BY HASH (`c1`)
312312
PARTITIONS 3
313313
DROP TABLE t1;
314314
SHOW TABLES;
@@ -349,7 +349,7 @@ t1 CREATE TABLE `t1` (
349349
`c1` bigint(20) NOT NULL,
350350
`c2` char(5) DEFAULT NULL
351351
) ENGINE=ENGINE DEFAULT CHARSET=latin1
352-
PARTITION BY HASH (c1)
352+
PARTITION BY HASH (`c1`)
353353
PARTITIONS 5
354354
ALTER TABLE t1 COALESCE PARTITION 2;
355355
SELECT * FROM t1 ORDER BY c1;
@@ -371,7 +371,7 @@ t1 CREATE TABLE `t1` (
371371
`c1` bigint(20) NOT NULL,
372372
`c2` char(5) DEFAULT NULL
373373
) ENGINE=ENGINE DEFAULT CHARSET=latin1
374-
PARTITION BY HASH (c1)
374+
PARTITION BY HASH (`c1`)
375375
PARTITIONS 3
376376
DROP TABLE t1;
377377
SHOW TABLES;
@@ -412,7 +412,7 @@ t1 CREATE TABLE `t1` (
412412
`c1` tinyint(4) NOT NULL,
413413
`c2` char(5) DEFAULT NULL
414414
) ENGINE=ENGINE DEFAULT CHARSET=latin1
415-
PARTITION BY KEY (c1)
415+
PARTITION BY KEY (`c1`)
416416
PARTITIONS 5
417417
ALTER TABLE t1 COALESCE PARTITION 2;
418418
SELECT * FROM t1 ORDER BY c1;
@@ -434,7 +434,7 @@ t1 CREATE TABLE `t1` (
434434
`c1` tinyint(4) NOT NULL,
435435
`c2` char(5) DEFAULT NULL
436436
) ENGINE=ENGINE DEFAULT CHARSET=latin1
437-
PARTITION BY KEY (c1)
437+
PARTITION BY KEY (`c1`)
438438
PARTITIONS 3
439439
DROP TABLE t1;
440440
SHOW TABLES;
@@ -475,7 +475,7 @@ t1 CREATE TABLE `t1` (
475475
`c1` smallint(6) NOT NULL,
476476
`c2` char(5) DEFAULT NULL
477477
) ENGINE=ENGINE DEFAULT CHARSET=latin1
478-
PARTITION BY KEY (c1)
478+
PARTITION BY KEY (`c1`)
479479
PARTITIONS 5
480480
ALTER TABLE t1 COALESCE PARTITION 2;
481481
SELECT * FROM t1 ORDER BY c1;
@@ -497,7 +497,7 @@ t1 CREATE TABLE `t1` (
497497
`c1` smallint(6) NOT NULL,
498498
`c2` char(5) DEFAULT NULL
499499
) ENGINE=ENGINE DEFAULT CHARSET=latin1
500-
PARTITION BY KEY (c1)
500+
PARTITION BY KEY (`c1`)
501501
PARTITIONS 3
502502
DROP TABLE t1;
503503
SHOW TABLES;
@@ -538,7 +538,7 @@ t1 CREATE TABLE `t1` (
538538
`c1` mediumint(9) NOT NULL,
539539
`c2` char(5) DEFAULT NULL
540540
) ENGINE=ENGINE DEFAULT CHARSET=latin1
541-
PARTITION BY KEY (c1)
541+
PARTITION BY KEY (`c1`)
542542
PARTITIONS 5
543543
ALTER TABLE t1 COALESCE PARTITION 2;
544544
SELECT * FROM t1 ORDER BY c1;
@@ -560,7 +560,7 @@ t1 CREATE TABLE `t1` (
560560
`c1` mediumint(9) NOT NULL,
561561
`c2` char(5) DEFAULT NULL
562562
) ENGINE=ENGINE DEFAULT CHARSET=latin1
563-
PARTITION BY KEY (c1)
563+
PARTITION BY KEY (`c1`)
564564
PARTITIONS 3
565565
DROP TABLE t1;
566566
SHOW TABLES;
@@ -601,7 +601,7 @@ t1 CREATE TABLE `t1` (
601601
`c1` int(11) NOT NULL,
602602
`c2` char(5) DEFAULT NULL
603603
) ENGINE=ENGINE DEFAULT CHARSET=latin1
604-
PARTITION BY KEY (c1)
604+
PARTITION BY KEY (`c1`)
605605
PARTITIONS 5
606606
ALTER TABLE t1 COALESCE PARTITION 2;
607607
SELECT * FROM t1 ORDER BY c1;
@@ -623,7 +623,7 @@ t1 CREATE TABLE `t1` (
623623
`c1` int(11) NOT NULL,
624624
`c2` char(5) DEFAULT NULL
625625
) ENGINE=ENGINE DEFAULT CHARSET=latin1
626-
PARTITION BY KEY (c1)
626+
PARTITION BY KEY (`c1`)
627627
PARTITIONS 3
628628
DROP TABLE t1;
629629
SHOW TABLES;
@@ -664,7 +664,7 @@ t1 CREATE TABLE `t1` (
664664
`c1` int(11) NOT NULL,
665665
`c2` char(5) DEFAULT NULL
666666
) ENGINE=ENGINE DEFAULT CHARSET=latin1
667-
PARTITION BY KEY (c1)
667+
PARTITION BY KEY (`c1`)
668668
PARTITIONS 5
669669
ALTER TABLE t1 COALESCE PARTITION 2;
670670
SELECT * FROM t1 ORDER BY c1;
@@ -686,7 +686,7 @@ t1 CREATE TABLE `t1` (
686686
`c1` int(11) NOT NULL,
687687
`c2` char(5) DEFAULT NULL
688688
) ENGINE=ENGINE DEFAULT CHARSET=latin1
689-
PARTITION BY KEY (c1)
689+
PARTITION BY KEY (`c1`)
690690
PARTITIONS 3
691691
DROP TABLE t1;
692692
SHOW TABLES;
@@ -727,7 +727,7 @@ t1 CREATE TABLE `t1` (
727727
`c1` bigint(20) NOT NULL,
728728
`c2` char(5) DEFAULT NULL
729729
) ENGINE=ENGINE DEFAULT CHARSET=latin1
730-
PARTITION BY KEY (c1)
730+
PARTITION BY KEY (`c1`)
731731
PARTITIONS 5
732732
ALTER TABLE t1 COALESCE PARTITION 2;
733733
SELECT * FROM t1 ORDER BY c1;
@@ -749,7 +749,7 @@ t1 CREATE TABLE `t1` (
749749
`c1` bigint(20) NOT NULL,
750750
`c2` char(5) DEFAULT NULL
751751
) ENGINE=ENGINE DEFAULT CHARSET=latin1
752-
PARTITION BY KEY (c1)
752+
PARTITION BY KEY (`c1`)
753753
PARTITIONS 3
754754
DROP TABLE t1;
755755
SHOW TABLES;

‎mysql-test/suite/engines/funcs/r/tc_partition_check.result

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ t1 CREATE TABLE `t1` (
2424
`c2` char(10) DEFAULT NULL,
2525
PRIMARY KEY (`c1`)
2626
) ENGINE=ENGINE DEFAULT CHARSET=latin1
27-
PARTITION BY RANGE (c1)
28-
(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
29-
PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
30-
PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
31-
PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
32-
PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
33-
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
27+
PARTITION BY RANGE (`c1`)
28+
(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
29+
PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
30+
PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
31+
PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
32+
PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
33+
PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
3434
ALTER TABLE t1 CHECK PARTITION p1,p2;
3535
Table Op Msg_type Msg_text
3636
test.t1 check status OK
@@ -48,13 +48,13 @@ t1 CREATE TABLE `t1` (
4848
`c2` char(10) DEFAULT NULL,
4949
PRIMARY KEY (`c1`)
5050
) ENGINE=ENGINE DEFAULT CHARSET=latin1
51-
PARTITION BY RANGE (c1)
52-
(PARTITION p0 VALUES LESS THAN (100) ENGINE = ENGINE,
53-
PARTITION p1 VALUES LESS THAN (200) ENGINE = ENGINE,
54-
PARTITION p2 VALUES LESS THAN (300) ENGINE = ENGINE,
55-
PARTITION p3 VALUES LESS THAN (400) ENGINE = ENGINE,
56-
PARTITION p4 VALUES LESS THAN (500) ENGINE = ENGINE,
57-
PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
51+
PARTITION BY RANGE (`c1`)
52+
(PARTITION `p0` VALUES LESS THAN (100) ENGINE = ENGINE,
53+
PARTITION `p1` VALUES LESS THAN (200) ENGINE = ENGINE,
54+
PARTITION `p2` VALUES LESS THAN (300) ENGINE = ENGINE,
55+
PARTITION `p3` VALUES LESS THAN (400) ENGINE = ENGINE,
56+
PARTITION `p4` VALUES LESS THAN (500) ENGINE = ENGINE,
57+
PARTITION `p5` VALUES LESS THAN MAXVALUE ENGINE = ENGINE)
5858
DROP TABLE t1;
5959
SHOW TABLES;
6060
Tables_in_test

0 commit comments

Comments
 (0)