diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/part_supported_sql_func_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/part_supported_sql_func_tokudb.result index 6bb98671feb..3ffeaa8abe1 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/part_supported_sql_func_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/part_supported_sql_func_tokudb.result @@ -2318,7 +2318,7 @@ t55 CREATE TABLE `t55` ( `col1` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 PARTITION BY LIST (`colint`) -SUBPARTITION BY HASH (`col1` % 10) +SUBPARTITION BY HASH (`col1` MOD 10) SUBPARTITIONS 5 (PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB, PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB, diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_2_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_2_tokudb.result index 3d944dccdb1..410e6fd0ba2 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_2_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_2_tokudb.result @@ -1067,7 +1067,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB 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 = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -3084,7 +3084,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -3592,7 +3592,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -5081,7 +5081,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB 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 = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -7098,7 +7098,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -7606,7 +7606,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -9128,7 +9128,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -11209,7 +11209,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -11733,7 +11733,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -13270,7 +13270,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -15351,7 +15351,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -15875,7 +15875,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -17384,7 +17384,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB 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 = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -19405,7 +19405,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -19914,7 +19914,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -21406,7 +21406,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB 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 = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -23427,7 +23427,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -23936,7 +23936,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -25428,7 +25428,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB 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 = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -27449,7 +27449,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -27958,7 +27958,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_tokudb.result index 7ad3d72441c..093dbbe11c5 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_tokudb.result @@ -1385,7 +1385,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -3404,7 +3404,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -3912,7 +3912,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -5401,7 +5401,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -7420,7 +7420,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -7928,7 +7928,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -9450,7 +9450,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -11533,7 +11533,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -12057,7 +12057,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -13594,7 +13594,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -15677,7 +15677,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -16201,7 +16201,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_2_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_2_tokudb.result index 9f53437fdf7..a05ce5cb71b 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_2_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_2_tokudb.result @@ -961,7 +961,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -2772,7 +2772,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -3228,7 +3228,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -4561,7 +4561,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -6372,7 +6372,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -6828,7 +6828,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -8193,7 +8193,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -10068,7 +10068,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -10540,7 +10540,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -11893,7 +11893,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB 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 = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -13702,7 +13702,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -14158,7 +14158,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -15491,7 +15491,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB 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 = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -17300,7 +17300,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -17756,7 +17756,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -19122,7 +19122,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB 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 = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -20995,7 +20995,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -21467,7 +21467,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -22848,7 +22848,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB 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 = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -24721,7 +24721,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -25193,7 +25193,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -26543,7 +26543,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB 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 = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -28352,7 +28352,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -28808,7 +28808,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -30141,7 +30141,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB 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 = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -31950,7 +31950,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -32406,7 +32406,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -33771,7 +33771,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB 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 = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -35644,7 +35644,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -36116,7 +36116,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_1_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_1_tokudb.result index d994f5f2654..a398ac33f42 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_1_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_1_tokudb.result @@ -994,7 +994,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -2869,7 +2869,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -3341,7 +3341,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -4800,7 +4800,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -6827,7 +6827,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -7337,7 +7337,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -8832,7 +8832,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -10859,7 +10859,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -11369,7 +11369,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -12893,7 +12893,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -14976,7 +14976,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -15500,7 +15500,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -17037,7 +17037,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -19120,7 +19120,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -19644,7 +19644,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_2_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_2_tokudb.result index f8c7eadb44c..60cc765a570 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_2_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_2_tokudb.result @@ -990,7 +990,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB 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 = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -2863,7 +2863,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -3335,7 +3335,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -4796,7 +4796,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB 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 = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -6825,7 +6825,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -7336,7 +7336,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -8834,7 +8834,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB 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 = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -10863,7 +10863,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -11374,7 +11374,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -12899,7 +12899,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -14980,7 +14980,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -15504,7 +15504,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -17041,7 +17041,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -19122,7 +19122,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -19646,7 +19646,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_1_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_1_tokudb.result index 1a4d1210a23..0b5d8289ecc 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_1_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_1_tokudb.result @@ -998,7 +998,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -2877,7 +2877,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -3351,7 +3351,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -4815,7 +4815,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -6846,7 +6846,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -7358,7 +7358,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -8859,7 +8859,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -10890,7 +10890,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -11402,7 +11402,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -12932,7 +12932,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -15019,7 +15019,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -15545,7 +15545,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -17088,7 +17088,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -19175,7 +19175,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -19701,7 +19701,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_2_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_2_tokudb.result index 36be0936c09..67bae3acecb 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_2_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_2_tokudb.result @@ -995,7 +995,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB 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 = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -2886,7 +2886,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -3361,7 +3361,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -4831,7 +4831,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB 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 = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -6878,7 +6878,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -7392,7 +7392,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -8899,7 +8899,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB 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 = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -10946,7 +10946,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -11460,7 +11460,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -12994,7 +12994,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -15093,7 +15093,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -15620,7 +15620,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -17166,7 +17166,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -19265,7 +19265,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -19792,7 +19792,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter4_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter4_tokudb.result index 3409f1d380e..808f646dd48 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter4_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter4_tokudb.result @@ -1004,7 +1004,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -2887,7 +2887,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -3361,7 +3361,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -4754,7 +4754,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -6637,7 +6637,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -7111,7 +7111,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -8504,7 +8504,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -10387,7 +10387,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -10861,7 +10861,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -12254,7 +12254,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -14137,7 +14137,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -14611,7 +14611,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -16004,7 +16004,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -17887,7 +17887,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -18361,7 +18361,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -19757,7 +19757,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -21640,7 +21640,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -22114,7 +22114,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -23507,7 +23507,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -25390,7 +25390,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -25864,7 +25864,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -27257,7 +27257,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -29140,7 +29140,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -29614,7 +29614,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -31007,7 +31007,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -32890,7 +32890,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -33364,7 +33364,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -34757,7 +34757,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -36640,7 +36640,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -37114,7 +37114,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -38513,7 +38513,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -40400,7 +40400,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -40875,7 +40875,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -42271,7 +42271,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -44158,7 +44158,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -44633,7 +44633,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -46026,7 +46026,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -47909,7 +47909,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -48383,7 +48383,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -49776,7 +49776,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -51659,7 +51659,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -52133,7 +52133,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -53529,7 +53529,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -55416,7 +55416,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -55891,7 +55891,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -57281,7 +57281,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -59156,7 +59156,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -59628,7 +59628,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -61015,7 +61015,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -62890,7 +62890,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -63362,7 +63362,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -65069,7 +65069,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -66944,7 +66944,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -67416,7 +67416,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -68812,7 +68812,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -70695,7 +70695,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -71169,7 +71169,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -72562,7 +72562,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -74445,7 +74445,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -74919,7 +74919,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -76312,7 +76312,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -78195,7 +78195,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -78669,7 +78669,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -80062,7 +80062,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -81945,7 +81945,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -82419,7 +82419,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -83812,7 +83812,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -85695,7 +85695,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -86169,7 +86169,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_basic_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_basic_tokudb.result index fca6cbe169e..ae20097fdda 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_basic_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_basic_tokudb.result @@ -991,7 +991,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -2866,7 +2866,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -3337,7 +3337,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -4716,7 +4716,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB 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 = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -6585,7 +6585,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -7056,7 +7056,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -8515,7 +8515,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -10538,7 +10538,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -11046,7 +11046,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -12535,7 +12535,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -14558,7 +14558,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -15066,7 +15066,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -16587,7 +16587,7 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -18674,7 +18674,7 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -19198,7 +19198,7 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -20708,7 +20708,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB 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 = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -22725,7 +22725,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -23233,7 +23233,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -24722,7 +24722,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB 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 = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -26739,7 +26739,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -27247,7 +27247,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -28768,7 +28768,7 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=TokuDB 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 = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -30849,7 +30849,7 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -31373,7 +31373,7 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB,