Skip to content

M
MariaDB
Commit 442ac922 authored by Alexander Barkov's avatar Alexander Barkov
Browse files
Options

Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3

parents 6ac3d751 3fd30508
Expand all Show whitespace changes
Inline Side-by-side
Showing with 322 additions and 322 deletions
mysql-test/suite/parts/r/part_supported_sql_func_innodb.result
View file @ 442ac922
...@@ -2318,7 +2318,7 @@ t55 CREATE TABLE `t55` ( ...@@ -2318,7 +2318,7 @@ t55 CREATE TABLE `t55` (
`col1` int(11) DEFAULT NULL `col1` int(11) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (`colint`) PARTITION BY LIST (`colint`)
SUBPARTITION BY HASH (`col1` % 10) SUBPARTITION BY HASH (`col1` MOD 10)
SUBPARTITIONS 5 SUBPARTITIONS 5
(PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB, (PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = InnoDB,
PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB, PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = InnoDB,
......
mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result
View file @ 442ac922
...@@ -1067,7 +1067,7 @@ t1 CREATE TABLE `t1` ( ...@@ -1067,7 +1067,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int1`,`f_int2`) PRIMARY KEY (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -3084,7 +3084,7 @@ t1 CREATE TABLE `t1` ( ...@@ -3084,7 +3084,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int1`,`f_int2`) PRIMARY KEY (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -3592,7 +3592,7 @@ t1 CREATE TABLE `t1` ( ...@@ -3592,7 +3592,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int1`,`f_int2`) PRIMARY KEY (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -5081,7 +5081,7 @@ t1 CREATE TABLE `t1` ( ...@@ -5081,7 +5081,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int2`,`f_int1`) PRIMARY KEY (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -7098,7 +7098,7 @@ t1 CREATE TABLE `t1` ( ...@@ -7098,7 +7098,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int2`,`f_int1`) PRIMARY KEY (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -7606,7 +7606,7 @@ t1 CREATE TABLE `t1` ( ...@@ -7606,7 +7606,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int2`,`f_int1`) PRIMARY KEY (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -9128,7 +9128,7 @@ t1 CREATE TABLE `t1` ( ...@@ -9128,7 +9128,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -11209,7 +11209,7 @@ t1 CREATE TABLE `t1` ( ...@@ -11209,7 +11209,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -11733,7 +11733,7 @@ t1 CREATE TABLE `t1` ( ...@@ -11733,7 +11733,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -13270,7 +13270,7 @@ t1 CREATE TABLE `t1` ( ...@@ -13270,7 +13270,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -15351,7 +15351,7 @@ t1 CREATE TABLE `t1` ( ...@@ -15351,7 +15351,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -15875,7 +15875,7 @@ t1 CREATE TABLE `t1` ( ...@@ -15875,7 +15875,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -17384,7 +17384,7 @@ t1 CREATE TABLE `t1` ( ...@@ -17384,7 +17384,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`f_int2`,`f_int1`), PRIMARY KEY (`f_int2`,`f_int1`),
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -19405,7 +19405,7 @@ t1 CREATE TABLE `t1` ( ...@@ -19405,7 +19405,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`f_int2`,`f_int1`), PRIMARY KEY (`f_int2`,`f_int1`),
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -19914,7 +19914,7 @@ t1 CREATE TABLE `t1` ( ...@@ -19914,7 +19914,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`f_int2`,`f_int1`), PRIMARY KEY (`f_int2`,`f_int1`),
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -21406,7 +21406,7 @@ t1 CREATE TABLE `t1` ( ...@@ -21406,7 +21406,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`f_int1`,`f_int2`), PRIMARY KEY (`f_int1`,`f_int2`),
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -23427,7 +23427,7 @@ t1 CREATE TABLE `t1` ( ...@@ -23427,7 +23427,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`f_int1`,`f_int2`), PRIMARY KEY (`f_int1`,`f_int2`),
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -23936,7 +23936,7 @@ t1 CREATE TABLE `t1` ( ...@@ -23936,7 +23936,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`f_int1`,`f_int2`), PRIMARY KEY (`f_int1`,`f_int2`),
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -25428,7 +25428,7 @@ t1 CREATE TABLE `t1` ( ...@@ -25428,7 +25428,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`f_int1`,`f_int2`), PRIMARY KEY (`f_int1`,`f_int2`),
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -27449,7 +27449,7 @@ t1 CREATE TABLE `t1` ( ...@@ -27449,7 +27449,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`f_int1`,`f_int2`), PRIMARY KEY (`f_int1`,`f_int2`),
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -27958,7 +27958,7 @@ t1 CREATE TABLE `t1` ( ...@@ -27958,7 +27958,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`f_int1`,`f_int2`), PRIMARY KEY (`f_int1`,`f_int2`),
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
......
mysql-test/suite/parts/r/partition_alter1_1_innodb.result
View file @ 442ac922
...@@ -1385,7 +1385,7 @@ t1 CREATE TABLE `t1` ( ...@@ -1385,7 +1385,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int1`,`f_int2`) PRIMARY KEY (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -3404,7 +3404,7 @@ t1 CREATE TABLE `t1` ( ...@@ -3404,7 +3404,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int1`,`f_int2`) PRIMARY KEY (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -3912,7 +3912,7 @@ t1 CREATE TABLE `t1` ( ...@@ -3912,7 +3912,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int1`,`f_int2`) PRIMARY KEY (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -5401,7 +5401,7 @@ t1 CREATE TABLE `t1` ( ...@@ -5401,7 +5401,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int2`,`f_int1`) PRIMARY KEY (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -7420,7 +7420,7 @@ t1 CREATE TABLE `t1` ( ...@@ -7420,7 +7420,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int2`,`f_int1`) PRIMARY KEY (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -7928,7 +7928,7 @@ t1 CREATE TABLE `t1` ( ...@@ -7928,7 +7928,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int2`,`f_int1`) PRIMARY KEY (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -9450,7 +9450,7 @@ t1 CREATE TABLE `t1` ( ...@@ -9450,7 +9450,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -11533,7 +11533,7 @@ t1 CREATE TABLE `t1` ( ...@@ -11533,7 +11533,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -12057,7 +12057,7 @@ t1 CREATE TABLE `t1` ( ...@@ -12057,7 +12057,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -13594,7 +13594,7 @@ t1 CREATE TABLE `t1` ( ...@@ -13594,7 +13594,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -15677,7 +15677,7 @@ t1 CREATE TABLE `t1` ( ...@@ -15677,7 +15677,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -16201,7 +16201,7 @@ t1 CREATE TABLE `t1` ( ...@@ -16201,7 +16201,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
......
mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result
View file @ 442ac922
...@@ -994,7 +994,7 @@ t1 CREATE TABLE `t1` ( ...@@ -994,7 +994,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -2869,7 +2869,7 @@ t1 CREATE TABLE `t1` ( ...@@ -2869,7 +2869,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -3341,7 +3341,7 @@ t1 CREATE TABLE `t1` ( ...@@ -3341,7 +3341,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -4800,7 +4800,7 @@ t1 CREATE TABLE `t1` ( ...@@ -4800,7 +4800,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int1`,`f_int2`) PRIMARY KEY (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -6827,7 +6827,7 @@ t1 CREATE TABLE `t1` ( ...@@ -6827,7 +6827,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int1`,`f_int2`) PRIMARY KEY (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -7337,7 +7337,7 @@ t1 CREATE TABLE `t1` ( ...@@ -7337,7 +7337,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int1`,`f_int2`) PRIMARY KEY (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -8832,7 +8832,7 @@ t1 CREATE TABLE `t1` ( ...@@ -8832,7 +8832,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int2`,`f_int1`) PRIMARY KEY (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -10859,7 +10859,7 @@ t1 CREATE TABLE `t1` ( ...@@ -10859,7 +10859,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int2`,`f_int1`) PRIMARY KEY (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -11369,7 +11369,7 @@ t1 CREATE TABLE `t1` ( ...@@ -11369,7 +11369,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int2`,`f_int1`) PRIMARY KEY (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -12893,7 +12893,7 @@ t1 CREATE TABLE `t1` ( ...@@ -12893,7 +12893,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -14976,7 +14976,7 @@ t1 CREATE TABLE `t1` ( ...@@ -14976,7 +14976,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -15500,7 +15500,7 @@ t1 CREATE TABLE `t1` ( ...@@ -15500,7 +15500,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -17037,7 +17037,7 @@ t1 CREATE TABLE `t1` ( ...@@ -17037,7 +17037,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -19120,7 +19120,7 @@ t1 CREATE TABLE `t1` ( ...@@ -19120,7 +19120,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -19644,7 +19644,7 @@ t1 CREATE TABLE `t1` ( ...@@ -19644,7 +19644,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
......
mysql-test/suite/parts/r/partition_alter2_1_2_innodb.result
View file @ 442ac922
...@@ -990,7 +990,7 @@ t1 CREATE TABLE `t1` ( ...@@ -990,7 +990,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -2863,7 +2863,7 @@ t1 CREATE TABLE `t1` ( ...@@ -2863,7 +2863,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -3335,7 +3335,7 @@ t1 CREATE TABLE `t1` ( ...@@ -3335,7 +3335,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -4796,7 +4796,7 @@ t1 CREATE TABLE `t1` ( ...@@ -4796,7 +4796,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int1`,`f_int2`) PRIMARY KEY (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -6825,7 +6825,7 @@ t1 CREATE TABLE `t1` ( ...@@ -6825,7 +6825,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int1`,`f_int2`) PRIMARY KEY (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -7336,7 +7336,7 @@ t1 CREATE TABLE `t1` ( ...@@ -7336,7 +7336,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int1`,`f_int2`) PRIMARY KEY (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -8834,7 +8834,7 @@ t1 CREATE TABLE `t1` ( ...@@ -8834,7 +8834,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int2`,`f_int1`) PRIMARY KEY (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -10863,7 +10863,7 @@ t1 CREATE TABLE `t1` ( ...@@ -10863,7 +10863,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int2`,`f_int1`) PRIMARY KEY (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -11374,7 +11374,7 @@ t1 CREATE TABLE `t1` ( ...@@ -11374,7 +11374,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int2`,`f_int1`) PRIMARY KEY (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -12899,7 +12899,7 @@ t1 CREATE TABLE `t1` ( ...@@ -12899,7 +12899,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int1`,`f_int2`) UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -14980,7 +14980,7 @@ t1 CREATE TABLE `t1` ( ...@@ -14980,7 +14980,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int1`,`f_int2`) UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -15504,7 +15504,7 @@ t1 CREATE TABLE `t1` ( ...@@ -15504,7 +15504,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int1`,`f_int2`) UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -17041,7 +17041,7 @@ t1 CREATE TABLE `t1` ( ...@@ -17041,7 +17041,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int2`,`f_int1`) UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -19122,7 +19122,7 @@ t1 CREATE TABLE `t1` ( ...@@ -19122,7 +19122,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int2`,`f_int1`) UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -19646,7 +19646,7 @@ t1 CREATE TABLE `t1` ( ...@@ -19646,7 +19646,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int2`,`f_int1`) UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
......
mysql-test/suite/parts/r/partition_alter2_1_maria.result
View file @ 442ac922
...@@ -1018,7 +1018,7 @@ t1 CREATE TABLE `t1` ( ...@@ -1018,7 +1018,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, (PARTITION `part_3` VALUES IN (-3) ENGINE = Aria,
PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, PARTITION `part_2` VALUES IN (-2) ENGINE = Aria,
PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, PARTITION `part_1` VALUES IN (-1) ENGINE = Aria,
...@@ -2973,7 +2973,7 @@ t1 CREATE TABLE `t1` ( ...@@ -2973,7 +2973,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = Aria, (SUBPARTITION `sp11` ENGINE = Aria,
...@@ -3466,7 +3466,7 @@ t1 CREATE TABLE `t1` ( ...@@ -3466,7 +3466,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = Aria, (PARTITION `part1` VALUES IN (0) ENGINE = Aria,
...@@ -5000,7 +5000,7 @@ t1 CREATE TABLE `t1` ( ...@@ -5000,7 +5000,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, (PARTITION `part_3` VALUES IN (-3) ENGINE = Aria,
PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, PARTITION `part_2` VALUES IN (-2) ENGINE = Aria,
PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, PARTITION `part_1` VALUES IN (-1) ENGINE = Aria,
...@@ -7163,7 +7163,7 @@ t1 CREATE TABLE `t1` ( ...@@ -7163,7 +7163,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = Aria, (SUBPARTITION `sp11` ENGINE = Aria,
...@@ -7708,7 +7708,7 @@ t1 CREATE TABLE `t1` ( ...@@ -7708,7 +7708,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = Aria, (PARTITION `part1` VALUES IN (0) ENGINE = Aria,
...@@ -9292,7 +9292,7 @@ t1 CREATE TABLE `t1` ( ...@@ -9292,7 +9292,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, (PARTITION `part_3` VALUES IN (-3) ENGINE = Aria,
PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, PARTITION `part_2` VALUES IN (-2) ENGINE = Aria,
PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, PARTITION `part_1` VALUES IN (-1) ENGINE = Aria,
...@@ -11455,7 +11455,7 @@ t1 CREATE TABLE `t1` ( ...@@ -11455,7 +11455,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = Aria, (SUBPARTITION `sp11` ENGINE = Aria,
...@@ -12000,7 +12000,7 @@ t1 CREATE TABLE `t1` ( ...@@ -12000,7 +12000,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = Aria, (PARTITION `part1` VALUES IN (0) ENGINE = Aria,
...@@ -13484,7 +13484,7 @@ t1 CREATE TABLE `t1` ( ...@@ -13484,7 +13484,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, (PARTITION `part_3` VALUES IN (-3) ENGINE = Aria,
PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, PARTITION `part_2` VALUES IN (-2) ENGINE = Aria,
PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, PARTITION `part_1` VALUES IN (-1) ENGINE = Aria,
...@@ -15437,7 +15437,7 @@ t1 CREATE TABLE `t1` ( ...@@ -15437,7 +15437,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = Aria, (SUBPARTITION `sp11` ENGINE = Aria,
...@@ -15930,7 +15930,7 @@ t1 CREATE TABLE `t1` ( ...@@ -15930,7 +15930,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = Aria, (PARTITION `part1` VALUES IN (0) ENGINE = Aria,
...@@ -17464,7 +17464,7 @@ t1 CREATE TABLE `t1` ( ...@@ -17464,7 +17464,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int1`,`f_int2`) UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, (PARTITION `part_3` VALUES IN (-3) ENGINE = Aria,
PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, PARTITION `part_2` VALUES IN (-2) ENGINE = Aria,
PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, PARTITION `part_1` VALUES IN (-1) ENGINE = Aria,
...@@ -19625,7 +19625,7 @@ t1 CREATE TABLE `t1` ( ...@@ -19625,7 +19625,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int1`,`f_int2`) UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = Aria, (SUBPARTITION `sp11` ENGINE = Aria,
...@@ -20170,7 +20170,7 @@ t1 CREATE TABLE `t1` ( ...@@ -20170,7 +20170,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int1`,`f_int2`) UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = Aria, (PARTITION `part1` VALUES IN (0) ENGINE = Aria,
...@@ -21754,7 +21754,7 @@ t1 CREATE TABLE `t1` ( ...@@ -21754,7 +21754,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int2`,`f_int1`) UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, (PARTITION `part_3` VALUES IN (-3) ENGINE = Aria,
PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, PARTITION `part_2` VALUES IN (-2) ENGINE = Aria,
PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, PARTITION `part_1` VALUES IN (-1) ENGINE = Aria,
...@@ -23915,7 +23915,7 @@ t1 CREATE TABLE `t1` ( ...@@ -23915,7 +23915,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int2`,`f_int1`) UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = Aria, (SUBPARTITION `sp11` ENGINE = Aria,
...@@ -24460,7 +24460,7 @@ t1 CREATE TABLE `t1` ( ...@@ -24460,7 +24460,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int2`,`f_int1`) UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = Aria, (PARTITION `part1` VALUES IN (0) ENGINE = Aria,
......
mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result
View file @ 442ac922
...@@ -998,7 +998,7 @@ t1 CREATE TABLE `t1` ( ...@@ -998,7 +998,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -2877,7 +2877,7 @@ t1 CREATE TABLE `t1` ( ...@@ -2877,7 +2877,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -3351,7 +3351,7 @@ t1 CREATE TABLE `t1` ( ...@@ -3351,7 +3351,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -4815,7 +4815,7 @@ t1 CREATE TABLE `t1` ( ...@@ -4815,7 +4815,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int1`,`f_int2`) PRIMARY KEY (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -6846,7 +6846,7 @@ t1 CREATE TABLE `t1` ( ...@@ -6846,7 +6846,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int1`,`f_int2`) PRIMARY KEY (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -7358,7 +7358,7 @@ t1 CREATE TABLE `t1` ( ...@@ -7358,7 +7358,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int1`,`f_int2`) PRIMARY KEY (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -8859,7 +8859,7 @@ t1 CREATE TABLE `t1` ( ...@@ -8859,7 +8859,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int2`,`f_int1`) PRIMARY KEY (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -10890,7 +10890,7 @@ t1 CREATE TABLE `t1` ( ...@@ -10890,7 +10890,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int2`,`f_int1`) PRIMARY KEY (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -11402,7 +11402,7 @@ t1 CREATE TABLE `t1` ( ...@@ -11402,7 +11402,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int2`,`f_int1`) PRIMARY KEY (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -12932,7 +12932,7 @@ t1 CREATE TABLE `t1` ( ...@@ -12932,7 +12932,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -15019,7 +15019,7 @@ t1 CREATE TABLE `t1` ( ...@@ -15019,7 +15019,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -15545,7 +15545,7 @@ t1 CREATE TABLE `t1` ( ...@@ -15545,7 +15545,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -17088,7 +17088,7 @@ t1 CREATE TABLE `t1` ( ...@@ -17088,7 +17088,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -19175,7 +19175,7 @@ t1 CREATE TABLE `t1` ( ...@@ -19175,7 +19175,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -19701,7 +19701,7 @@ t1 CREATE TABLE `t1` ( ...@@ -19701,7 +19701,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
......
mysql-test/suite/parts/r/partition_alter2_2_2_innodb.result
View file @ 442ac922
...@@ -995,7 +995,7 @@ t1 CREATE TABLE `t1` ( ...@@ -995,7 +995,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -2886,7 +2886,7 @@ t1 CREATE TABLE `t1` ( ...@@ -2886,7 +2886,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -3361,7 +3361,7 @@ t1 CREATE TABLE `t1` ( ...@@ -3361,7 +3361,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -4831,7 +4831,7 @@ t1 CREATE TABLE `t1` ( ...@@ -4831,7 +4831,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int1`,`f_int2`) PRIMARY KEY (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -6878,7 +6878,7 @@ t1 CREATE TABLE `t1` ( ...@@ -6878,7 +6878,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int1`,`f_int2`) PRIMARY KEY (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -7392,7 +7392,7 @@ t1 CREATE TABLE `t1` ( ...@@ -7392,7 +7392,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int1`,`f_int2`) PRIMARY KEY (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -8899,7 +8899,7 @@ t1 CREATE TABLE `t1` ( ...@@ -8899,7 +8899,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int2`,`f_int1`) PRIMARY KEY (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -10946,7 +10946,7 @@ t1 CREATE TABLE `t1` ( ...@@ -10946,7 +10946,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int2`,`f_int1`) PRIMARY KEY (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -11460,7 +11460,7 @@ t1 CREATE TABLE `t1` ( ...@@ -11460,7 +11460,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`f_int2`,`f_int1`) PRIMARY KEY (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -12994,7 +12994,7 @@ t1 CREATE TABLE `t1` ( ...@@ -12994,7 +12994,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int1`,`f_int2`) UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -15093,7 +15093,7 @@ t1 CREATE TABLE `t1` ( ...@@ -15093,7 +15093,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int1`,`f_int2`) UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -15620,7 +15620,7 @@ t1 CREATE TABLE `t1` ( ...@@ -15620,7 +15620,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int1`,`f_int2`) UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -17166,7 +17166,7 @@ t1 CREATE TABLE `t1` ( ...@@ -17166,7 +17166,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int2`,`f_int1`) UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -19265,7 +19265,7 @@ t1 CREATE TABLE `t1` ( ...@@ -19265,7 +19265,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int2`,`f_int1`) UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -19792,7 +19792,7 @@ t1 CREATE TABLE `t1` ( ...@@ -19792,7 +19792,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int2`,`f_int1`) UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
......
mysql-test/suite/parts/r/partition_alter2_2_maria.result
View file @ 442ac922
...@@ -1022,7 +1022,7 @@ t1 CREATE TABLE `t1` ( ...@@ -1022,7 +1022,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, (PARTITION `part_3` VALUES IN (-3) ENGINE = Aria,
PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, PARTITION `part_2` VALUES IN (-2) ENGINE = Aria,
PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, PARTITION `part_1` VALUES IN (-1) ENGINE = Aria,
...@@ -2981,7 +2981,7 @@ t1 CREATE TABLE `t1` ( ...@@ -2981,7 +2981,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = Aria, (SUBPARTITION `sp11` ENGINE = Aria,
...@@ -3476,7 +3476,7 @@ t1 CREATE TABLE `t1` ( ...@@ -3476,7 +3476,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = Aria, (PARTITION `part1` VALUES IN (0) ENGINE = Aria,
...@@ -5016,7 +5016,7 @@ t1 CREATE TABLE `t1` ( ...@@ -5016,7 +5016,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, (PARTITION `part_3` VALUES IN (-3) ENGINE = Aria,
PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, PARTITION `part_2` VALUES IN (-2) ENGINE = Aria,
PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, PARTITION `part_1` VALUES IN (-1) ENGINE = Aria,
...@@ -7183,7 +7183,7 @@ t1 CREATE TABLE `t1` ( ...@@ -7183,7 +7183,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = Aria, (SUBPARTITION `sp11` ENGINE = Aria,
...@@ -7730,7 +7730,7 @@ t1 CREATE TABLE `t1` ( ...@@ -7730,7 +7730,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = Aria, (PARTITION `part1` VALUES IN (0) ENGINE = Aria,
...@@ -9320,7 +9320,7 @@ t1 CREATE TABLE `t1` ( ...@@ -9320,7 +9320,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, (PARTITION `part_3` VALUES IN (-3) ENGINE = Aria,
PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, PARTITION `part_2` VALUES IN (-2) ENGINE = Aria,
PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, PARTITION `part_1` VALUES IN (-1) ENGINE = Aria,
...@@ -11487,7 +11487,7 @@ t1 CREATE TABLE `t1` ( ...@@ -11487,7 +11487,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = Aria, (SUBPARTITION `sp11` ENGINE = Aria,
...@@ -12034,7 +12034,7 @@ t1 CREATE TABLE `t1` ( ...@@ -12034,7 +12034,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = Aria, (PARTITION `part1` VALUES IN (0) ENGINE = Aria,
...@@ -13525,7 +13525,7 @@ t1 CREATE TABLE `t1` ( ...@@ -13525,7 +13525,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, (PARTITION `part_3` VALUES IN (-3) ENGINE = Aria,
PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, PARTITION `part_2` VALUES IN (-2) ENGINE = Aria,
PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, PARTITION `part_1` VALUES IN (-1) ENGINE = Aria,
...@@ -15496,7 +15496,7 @@ t1 CREATE TABLE `t1` ( ...@@ -15496,7 +15496,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = Aria, (SUBPARTITION `sp11` ENGINE = Aria,
...@@ -15992,7 +15992,7 @@ t1 CREATE TABLE `t1` ( ...@@ -15992,7 +15992,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = Aria, (PARTITION `part1` VALUES IN (0) ENGINE = Aria,
...@@ -17535,7 +17535,7 @@ t1 CREATE TABLE `t1` ( ...@@ -17535,7 +17535,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int1`,`f_int2`) UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, (PARTITION `part_3` VALUES IN (-3) ENGINE = Aria,
PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, PARTITION `part_2` VALUES IN (-2) ENGINE = Aria,
PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, PARTITION `part_1` VALUES IN (-1) ENGINE = Aria,
...@@ -19714,7 +19714,7 @@ t1 CREATE TABLE `t1` ( ...@@ -19714,7 +19714,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int1`,`f_int2`) UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = Aria, (SUBPARTITION `sp11` ENGINE = Aria,
...@@ -20262,7 +20262,7 @@ t1 CREATE TABLE `t1` ( ...@@ -20262,7 +20262,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int1`,`f_int2`) UNIQUE KEY `uidx` (`f_int1`,`f_int2`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = Aria, (PARTITION `part1` VALUES IN (0) ENGINE = Aria,
...@@ -21855,7 +21855,7 @@ t1 CREATE TABLE `t1` ( ...@@ -21855,7 +21855,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int2`,`f_int1`) UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = Aria, (PARTITION `part_3` VALUES IN (-3) ENGINE = Aria,
PARTITION `part_2` VALUES IN (-2) ENGINE = Aria, PARTITION `part_2` VALUES IN (-2) ENGINE = Aria,
PARTITION `part_1` VALUES IN (-1) ENGINE = Aria, PARTITION `part_1` VALUES IN (-1) ENGINE = Aria,
...@@ -24034,7 +24034,7 @@ t1 CREATE TABLE `t1` ( ...@@ -24034,7 +24034,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int2`,`f_int1`) UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = Aria, (SUBPARTITION `sp11` ENGINE = Aria,
...@@ -24582,7 +24582,7 @@ t1 CREATE TABLE `t1` ( ...@@ -24582,7 +24582,7 @@ t1 CREATE TABLE `t1` (
`f_charbig` varchar(1000) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL,
UNIQUE KEY `uidx` (`f_int2`,`f_int1`) UNIQUE KEY `uidx` (`f_int2`,`f_int1`)
) ENGINE=Aria DEFAULT CHARSET=latin1 ) ENGINE=Aria DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = Aria, (PARTITION `part1` VALUES IN (0) ENGINE = Aria,
......
mysql-test/suite/parts/r/partition_basic_innodb.result
View file @ 442ac922
...@@ -998,7 +998,7 @@ t1 CREATE TABLE `t1` ( ...@@ -998,7 +998,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -2903,7 +2903,7 @@ t1 CREATE TABLE `t1` ( ...@@ -2903,7 +2903,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -3382,7 +3382,7 @@ t1 CREATE TABLE `t1` ( ...@@ -3382,7 +3382,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -4777,7 +4777,7 @@ t1 CREATE TABLE `t1` ( ...@@ -4777,7 +4777,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -6676,7 +6676,7 @@ t1 CREATE TABLE `t1` ( ...@@ -6676,7 +6676,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -7155,7 +7155,7 @@ t1 CREATE TABLE `t1` ( ...@@ -7155,7 +7155,7 @@ t1 CREATE TABLE `t1` (
`f_char2` char(20) DEFAULT NULL, `f_char2` char(20) DEFAULT NULL,
`f_charbig` varchar(1000) DEFAULT NULL `f_charbig` varchar(1000) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -8630,7 +8630,7 @@ t1 CREATE TABLE `t1` ( ...@@ -8630,7 +8630,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`f_int2`,`f_int1`), PRIMARY KEY (`f_int2`,`f_int1`),
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -10683,7 +10683,7 @@ t1 CREATE TABLE `t1` ( ...@@ -10683,7 +10683,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`f_int2`,`f_int1`), PRIMARY KEY (`f_int2`,`f_int1`),
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -11199,7 +11199,7 @@ t1 CREATE TABLE `t1` ( ...@@ -11199,7 +11199,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`f_int2`,`f_int1`), PRIMARY KEY (`f_int2`,`f_int1`),
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -12704,7 +12704,7 @@ t1 CREATE TABLE `t1` ( ...@@ -12704,7 +12704,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`f_int1`,`f_int2`), PRIMARY KEY (`f_int1`,`f_int2`),
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -14757,7 +14757,7 @@ t1 CREATE TABLE `t1` ( ...@@ -14757,7 +14757,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`f_int1`,`f_int2`), PRIMARY KEY (`f_int1`,`f_int2`),
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -15273,7 +15273,7 @@ t1 CREATE TABLE `t1` ( ...@@ -15273,7 +15273,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`f_int1`,`f_int2`), PRIMARY KEY (`f_int1`,`f_int2`),
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -16810,7 +16810,7 @@ t1 CREATE TABLE `t1` ( ...@@ -16810,7 +16810,7 @@ t1 CREATE TABLE `t1` (
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (`f_int1` % 4) PARTITION BY LIST (`f_int1` MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -18927,7 +18927,7 @@ t1 CREATE TABLE `t1` ( ...@@ -18927,7 +18927,7 @@ t1 CREATE TABLE `t1` (
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -19459,7 +19459,7 @@ t1 CREATE TABLE `t1` ( ...@@ -19459,7 +19459,7 @@ t1 CREATE TABLE `t1` (
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int1`) SUBPARTITION BY KEY (`f_int1`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -20985,7 +20985,7 @@ t1 CREATE TABLE `t1` ( ...@@ -20985,7 +20985,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`f_int2`,`f_int1`), PRIMARY KEY (`f_int2`,`f_int1`),
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -23032,7 +23032,7 @@ t1 CREATE TABLE `t1` ( ...@@ -23032,7 +23032,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`f_int2`,`f_int1`), PRIMARY KEY (`f_int2`,`f_int1`),
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -23548,7 +23548,7 @@ t1 CREATE TABLE `t1` ( ...@@ -23548,7 +23548,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`f_int2`,`f_int1`), PRIMARY KEY (`f_int2`,`f_int1`),
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) UNIQUE KEY `uidx1` (`f_int1`,`f_int2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -25053,7 +25053,7 @@ t1 CREATE TABLE `t1` ( ...@@ -25053,7 +25053,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`f_int1`,`f_int2`), PRIMARY KEY (`f_int1`,`f_int2`),
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -27100,7 +27100,7 @@ t1 CREATE TABLE `t1` ( ...@@ -27100,7 +27100,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`f_int1`,`f_int2`), PRIMARY KEY (`f_int1`,`f_int2`),
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -27616,7 +27616,7 @@ t1 CREATE TABLE `t1` ( ...@@ -27616,7 +27616,7 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`f_int1`,`f_int2`), PRIMARY KEY (`f_int1`,`f_int2`),
UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) UNIQUE KEY `uidx1` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
...@@ -29153,7 +29153,7 @@ t1 CREATE TABLE `t1` ( ...@@ -29153,7 +29153,7 @@ t1 CREATE TABLE `t1` (
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4)
(PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB, (PARTITION `part_3` VALUES IN (-3) ENGINE = InnoDB,
PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB, PARTITION `part_2` VALUES IN (-2) ENGINE = InnoDB,
PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB, PARTITION `part_1` VALUES IN (-1) ENGINE = InnoDB,
...@@ -31264,7 +31264,7 @@ t1 CREATE TABLE `t1` ( ...@@ -31264,7 +31264,7 @@ t1 CREATE TABLE `t1` (
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 3)) PARTITION BY LIST (abs(`f_int1` MOD 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 = InnoDB, (SUBPARTITION `sp11` ENGINE = InnoDB,
...@@ -31796,7 +31796,7 @@ t1 CREATE TABLE `t1` ( ...@@ -31796,7 +31796,7 @@ t1 CREATE TABLE `t1` (
UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`),
UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) UNIQUE KEY `uidx2` (`f_int2`,`f_int1`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
PARTITION BY LIST (abs(`f_int1` % 2)) PARTITION BY LIST (abs(`f_int1` MOD 2))
SUBPARTITION BY KEY (`f_int2`) SUBPARTITION BY KEY (`f_int2`)
SUBPARTITIONS 3 SUBPARTITIONS 3
(PARTITION `part1` VALUES IN (0) ENGINE = InnoDB, (PARTITION `part1` VALUES IN (0) ENGINE = InnoDB,
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7