Skip to content

M
mariadb
Commit ad03b65d authored by Mattias Jonsson's avatar Mattias Jonsson
Browse files
Options

merge of bug#47135 into mysql-next-mr-bugfixing

parent 79738267
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 80961 additions and 25207 deletions
mysql-test/suite/parts/inc/partition_alter2_1.inc
View file @ ad03b65d
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
# Change: Splitted the test in two different parts (increasing/decreasing col) # # Change: Splitted the test in two different parts (increasing/decreasing col) #
################################################################################ ################################################################################
if (!$only_part_2)
{
--echo --echo
--echo #======================================================================== --echo #========================================================================
--echo # 1 Increase the size of the column used in the partitioning --echo # 1 Increase the size of the column used in the partitioning
...@@ -89,13 +91,16 @@ if ($more_pk_ui_tests) ...@@ -89,13 +91,16 @@ if ($more_pk_ui_tests)
let $unique= , UNIQUE INDEX uidx (f_int1); let $unique= , UNIQUE INDEX uidx (f_int1);
--source suite/parts/inc/partition_alter_11.inc --source suite/parts/inc/partition_alter_11.inc
let $unique= , UNIQUE INDEX uidx (f_int1,f_int2); let $unique= , UNIQUE INDEX uidx (f_int1,f_int2);
--source suite/parts/inc/partition_alter_11.inc #--source suite/parts/inc/partition_alter_11.inc
--source suite/parts/inc/partition_alter_13.inc --source suite/parts/inc/partition_alter_13.inc
let $unique= , UNIQUE INDEX uidx (f_int2,f_int1); let $unique= , UNIQUE INDEX uidx (f_int2,f_int1);
--source suite/parts/inc/partition_alter_11.inc #--source suite/parts/inc/partition_alter_11.inc
--source suite/parts/inc/partition_alter_13.inc --source suite/parts/inc/partition_alter_13.inc
} }
}
# #
if (!$only_part_1)
{
--echo #------------------------------------------------------------------------ --echo #------------------------------------------------------------------------
--echo # 1.3 ALTER column f_int1 and f_int2 --echo # 1.3 ALTER column f_int1 and f_int2
--echo # f_int1 or (f_int1 and f_int2) used in partitioning function --echo # f_int1 or (f_int1 and f_int2) used in partitioning function
...@@ -105,7 +110,7 @@ if ($more_pk_ui_tests) ...@@ -105,7 +110,7 @@ if ($more_pk_ui_tests)
let $alter= ALTER TABLE t1 MODIFY f_int1 BIGINT, MODIFY f_int2 BIGINT; let $alter= ALTER TABLE t1 MODIFY f_int1 BIGINT, MODIFY f_int2 BIGINT;
--echo # 1.3.1 no PRIMARY KEY or UNIQUE INDEX exists --echo # 1.3.1 no PRIMARY KEY or UNIQUE INDEX exists
let $unique= ; let $unique= ;
--source suite/parts/inc/partition_alter_11.inc #--source suite/parts/inc/partition_alter_11.inc
--source suite/parts/inc/partition_alter_13.inc --source suite/parts/inc/partition_alter_13.inc
# #
if ($do_pk_tests) if ($do_pk_tests)
...@@ -119,10 +124,10 @@ if ($do_pk_tests) ...@@ -119,10 +124,10 @@ if ($do_pk_tests)
--source suite/parts/inc/partition_alter_11.inc --source suite/parts/inc/partition_alter_11.inc
} }
let $unique= , PRIMARY KEY (f_int1,f_int2); let $unique= , PRIMARY KEY (f_int1,f_int2);
--source suite/parts/inc/partition_alter_11.inc #--source suite/parts/inc/partition_alter_11.inc
--source suite/parts/inc/partition_alter_13.inc --source suite/parts/inc/partition_alter_13.inc
let $unique= , PRIMARY KEY (f_int2,f_int1); let $unique= , PRIMARY KEY (f_int2,f_int1);
--source suite/parts/inc/partition_alter_11.inc #--source suite/parts/inc/partition_alter_11.inc
--source suite/parts/inc/partition_alter_13.inc --source suite/parts/inc/partition_alter_13.inc
} }
# #
...@@ -135,11 +140,12 @@ if ($more_pk_ui_tests) ...@@ -135,11 +140,12 @@ if ($more_pk_ui_tests)
--source suite/parts/inc/partition_alter_11.inc --source suite/parts/inc/partition_alter_11.inc
} }
let $unique= , UNIQUE INDEX uidx (f_int1,f_int2); let $unique= , UNIQUE INDEX uidx (f_int1,f_int2);
--source suite/parts/inc/partition_alter_11.inc #--source suite/parts/inc/partition_alter_11.inc
--source suite/parts/inc/partition_alter_13.inc --source suite/parts/inc/partition_alter_13.inc
let $unique= , UNIQUE INDEX uidx (f_int2,f_int1); let $unique= , UNIQUE INDEX uidx (f_int2,f_int1);
--source suite/parts/inc/partition_alter_11.inc #--source suite/parts/inc/partition_alter_11.inc
--source suite/parts/inc/partition_alter_13.inc --source suite/parts/inc/partition_alter_13.inc
}
if (0) if (0)
{ {
......
mysql-test/suite/parts/inc/partition_alter2_2.inc
View file @ ad03b65d
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
# Change: Splitted the test in two different parts (increasing/decreasing col) # # Change: Splitted the test in two different parts (increasing/decreasing col) #
################################################################################ ################################################################################
if (!$only_part_2)
{
--echo --echo
--echo #======================================================================== --echo #========================================================================
--echo # 2 Decrease the size of the column used in the partitioning --echo # 2 Decrease the size of the column used in the partitioning
...@@ -95,7 +97,10 @@ if ($more_pk_ui_tests) ...@@ -95,7 +97,10 @@ if ($more_pk_ui_tests)
--source suite/parts/inc/partition_alter_11.inc --source suite/parts/inc/partition_alter_11.inc
--source suite/parts/inc/partition_alter_13.inc --source suite/parts/inc/partition_alter_13.inc
} }
}
# #
if (!$only_part_1)
{
--echo #------------------------------------------------------------------------ --echo #------------------------------------------------------------------------
--echo # 2.3 ALTER column f_int1 and f_int2 used in partitioning function --echo # 2.3 ALTER column f_int1 and f_int2 used in partitioning function
--echo #------------------------------------------------------------------------ --echo #------------------------------------------------------------------------
...@@ -104,7 +109,7 @@ if ($more_pk_ui_tests) ...@@ -104,7 +109,7 @@ if ($more_pk_ui_tests)
let $alter= ALTER TABLE t1 MODIFY f_int1 MEDIUMINT, MODIFY f_int2 MEDIUMINT; let $alter= ALTER TABLE t1 MODIFY f_int1 MEDIUMINT, MODIFY f_int2 MEDIUMINT;
--echo # 2.3.1 no PRIMARY KEY or UNIQUE INDEX exists --echo # 2.3.1 no PRIMARY KEY or UNIQUE INDEX exists
let $unique= ; let $unique= ;
--source suite/parts/inc/partition_alter_11.inc #--source suite/parts/inc/partition_alter_11.inc
--source suite/parts/inc/partition_alter_13.inc --source suite/parts/inc/partition_alter_13.inc
# #
if ($do_pk_tests) if ($do_pk_tests)
...@@ -118,10 +123,10 @@ if ($do_pk_tests) ...@@ -118,10 +123,10 @@ if ($do_pk_tests)
--source suite/parts/inc/partition_alter_11.inc --source suite/parts/inc/partition_alter_11.inc
} }
let $unique= , PRIMARY KEY (f_int1,f_int2); let $unique= , PRIMARY KEY (f_int1,f_int2);
--source suite/parts/inc/partition_alter_11.inc #--source suite/parts/inc/partition_alter_11.inc
--source suite/parts/inc/partition_alter_13.inc --source suite/parts/inc/partition_alter_13.inc
let $unique= , PRIMARY KEY (f_int2,f_int1); let $unique= , PRIMARY KEY (f_int2,f_int1);
--source suite/parts/inc/partition_alter_11.inc #--source suite/parts/inc/partition_alter_11.inc
--source suite/parts/inc/partition_alter_13.inc --source suite/parts/inc/partition_alter_13.inc
} }
# #
...@@ -134,11 +139,12 @@ if ($more_pk_ui_tests) ...@@ -134,11 +139,12 @@ if ($more_pk_ui_tests)
--source suite/parts/inc/partition_alter_11.inc --source suite/parts/inc/partition_alter_11.inc
} }
let $unique= , UNIQUE INDEX uidx (f_int1,f_int2); let $unique= , UNIQUE INDEX uidx (f_int1,f_int2);
--source suite/parts/inc/partition_alter_11.inc #--source suite/parts/inc/partition_alter_11.inc
--source suite/parts/inc/partition_alter_13.inc --source suite/parts/inc/partition_alter_13.inc
let $unique= , UNIQUE INDEX uidx (f_int2,f_int1); let $unique= , UNIQUE INDEX uidx (f_int2,f_int1);
--source suite/parts/inc/partition_alter_11.inc #--source suite/parts/inc/partition_alter_11.inc
--source suite/parts/inc/partition_alter_13.inc --source suite/parts/inc/partition_alter_13.inc
}
# #
if (0) if (0)
......
mysql-test/suite/parts/inc/partition_alter_13.inc
View file @ ad03b65d
...@@ -92,16 +92,13 @@ $partitioning; ...@@ -92,16 +92,13 @@ $partitioning;
#----------- PARTITION BY RANGE #----------- PARTITION BY RANGE
if ($with_partitioning) if ($with_partitioning)
{ {
--disable_query_log let $partitioning= PARTITION BY RANGE((f_int1 + f_int2) DIV 2)
eval SET @aux = 'PARTITION BY RANGE((f_int1 + f_int2) DIV 2)
(PARTITION parta VALUES LESS THAN (0), (PARTITION parta VALUES LESS THAN (0),
PARTITION partb VALUES LESS THAN ($max_row_div4), PARTITION partb VALUES LESS THAN ($max_row_div4),
PARTITION partc VALUES LESS THAN ($max_row_div2), PARTITION partc VALUES LESS THAN ($max_row_div2),
PARTITION partd VALUES LESS THAN ($max_row_div2 + $max_row_div4), PARTITION partd VALUES LESS THAN ($max_row_div2 + $max_row_div4),
PARTITION parte VALUES LESS THAN ($max_row), PARTITION parte VALUES LESS THAN ($max_row),
PARTITION partf VALUES LESS THAN $MAX_VALUE)'; PARTITION partf VALUES LESS THAN $MAX_VALUE);
let $partitioning= `SELECT @aux`;
--enable_query_log
} }
eval CREATE TABLE t1 ( eval CREATE TABLE t1 (
$column_list $column_list
...@@ -113,15 +110,11 @@ $partitioning; ...@@ -113,15 +110,11 @@ $partitioning;
#----------- PARTITION BY RANGE -- SUBPARTITION BY HASH #----------- PARTITION BY RANGE -- SUBPARTITION BY HASH
if ($with_partitioning) if ($with_partitioning)
{ {
--disable_query_log let $partitioning= PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int2) SUBPARTITIONS 2
eval SET @aux =
'PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int2) SUBPARTITIONS 2
(PARTITION parta VALUES LESS THAN (0), (PARTITION parta VALUES LESS THAN (0),
PARTITION partb VALUES LESS THAN ($max_row_div4), PARTITION partb VALUES LESS THAN ($max_row_div4),
PARTITION partc VALUES LESS THAN ($max_row_div2), PARTITION partc VALUES LESS THAN ($max_row_div2),
PARTITION partd VALUES LESS THAN $MAX_VALUE)'; PARTITION partd VALUES LESS THAN $MAX_VALUE);
let $partitioning= `SELECT @aux`;
--enable_query_log
} }
eval CREATE TABLE t1 ( eval CREATE TABLE t1 (
$column_list $column_list
...@@ -133,8 +126,7 @@ $partitioning; ...@@ -133,8 +126,7 @@ $partitioning;
#----------- PARTITION BY RANGE -- SUBPARTITION BY KEY #----------- PARTITION BY RANGE -- SUBPARTITION BY KEY
if ($with_partitioning) if ($with_partitioning)
{ {
--disable_query_log let $partitioning= PARTITION BY RANGE(f_int1) SUBPARTITION BY KEY(f_int2)
eval SET @aux = 'PARTITION BY RANGE(f_int1) SUBPARTITION BY KEY(f_int2)
(PARTITION part1 VALUES LESS THAN (0) (PARTITION part1 VALUES LESS THAN (0)
(SUBPARTITION subpart11, SUBPARTITION subpart12), (SUBPARTITION subpart11, SUBPARTITION subpart12),
PARTITION part2 VALUES LESS THAN ($max_row_div4) PARTITION part2 VALUES LESS THAN ($max_row_div4)
...@@ -142,9 +134,7 @@ PARTITION part2 VALUES LESS THAN ($max_row_div4) ...@@ -142,9 +134,7 @@ PARTITION part2 VALUES LESS THAN ($max_row_div4)
PARTITION part3 VALUES LESS THAN ($max_row_div2) PARTITION part3 VALUES LESS THAN ($max_row_div2)
(SUBPARTITION subpart31, SUBPARTITION subpart32), (SUBPARTITION subpart31, SUBPARTITION subpart32),
PARTITION part4 VALUES LESS THAN $MAX_VALUE PARTITION part4 VALUES LESS THAN $MAX_VALUE
(SUBPARTITION subpart41, SUBPARTITION subpart42))'; (SUBPARTITION subpart41, SUBPARTITION subpart42));
let $partitioning= `SELECT @aux`;
--enable_query_log
} }
eval CREATE TABLE t1 ( eval CREATE TABLE t1 (
$column_list $column_list
...@@ -176,15 +166,11 @@ $partitioning; ...@@ -176,15 +166,11 @@ $partitioning;
#----------- PARTITION BY LIST -- SUBPARTITION BY KEY #----------- PARTITION BY LIST -- SUBPARTITION BY KEY
if ($with_partitioning) if ($with_partitioning)
{ {
--disable_query_log let $partitioning= PARTITION BY LIST(ABS(MOD(f_int1,2)))
eval SET @aux =
'PARTITION BY LIST(ABS(MOD(f_int1,2)))
SUBPARTITION BY KEY(f_int2) SUBPARTITIONS $sub_part_no SUBPARTITION BY KEY(f_int2) SUBPARTITIONS $sub_part_no
(PARTITION part1 VALUES IN (0), (PARTITION part1 VALUES IN (0),
PARTITION part2 VALUES IN (1), PARTITION part2 VALUES IN (1),
PARTITION part3 VALUES IN (NULL))'; PARTITION part3 VALUES IN (NULL));
let $partitioning= `SELECT @aux`;
--enable_query_log
} }
eval CREATE TABLE t1 ( eval CREATE TABLE t1 (
$column_list $column_list
......
mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result
View file @ ad03b65d
...@@ -3571,8 +3571,8 @@ f_charbig VARCHAR(1000) ...@@ -3571,8 +3571,8 @@ f_charbig VARCHAR(1000)
PARTITION BY LIST(ABS(MOD(f_int1,2))) PARTITION BY LIST(ABS(MOD(f_int1,2)))
SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3 SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3
(PARTITION part1 VALUES IN (0), (PARTITION part1 VALUES IN (0),
PARTITION part2 VALUES IN (1), PARTITION part2 VALUES IN (1),
PARTITION part3 VALUES IN (NULL)); PARTITION part3 VALUES IN (NULL));
INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig) INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1; WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
...@@ -7585,8 +7585,8 @@ f_charbig VARCHAR(1000) ...@@ -7585,8 +7585,8 @@ f_charbig VARCHAR(1000)
PARTITION BY LIST(ABS(MOD(f_int1,2))) PARTITION BY LIST(ABS(MOD(f_int1,2)))
SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3 SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3
(PARTITION part1 VALUES IN (0), (PARTITION part1 VALUES IN (0),
PARTITION part2 VALUES IN (1), PARTITION part2 VALUES IN (1),
PARTITION part3 VALUES IN (NULL)); PARTITION part3 VALUES IN (NULL));
INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig) INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1; WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
...@@ -11712,8 +11712,8 @@ f_charbig VARCHAR(1000) ...@@ -11712,8 +11712,8 @@ f_charbig VARCHAR(1000)
PARTITION BY LIST(ABS(MOD(f_int1,2))) PARTITION BY LIST(ABS(MOD(f_int1,2)))
SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3 SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3
(PARTITION part1 VALUES IN (0), (PARTITION part1 VALUES IN (0),
PARTITION part2 VALUES IN (1), PARTITION part2 VALUES IN (1),
PARTITION part3 VALUES IN (NULL)); PARTITION part3 VALUES IN (NULL));
INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig) INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1; WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
...@@ -15854,8 +15854,8 @@ f_charbig VARCHAR(1000) ...@@ -15854,8 +15854,8 @@ f_charbig VARCHAR(1000)
PARTITION BY LIST(ABS(MOD(f_int1,2))) PARTITION BY LIST(ABS(MOD(f_int1,2)))
SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3 SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3
(PARTITION part1 VALUES IN (0), (PARTITION part1 VALUES IN (0),
PARTITION part2 VALUES IN (1), PARTITION part2 VALUES IN (1),
PARTITION part3 VALUES IN (NULL)); PARTITION part3 VALUES IN (NULL));
INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig) INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1; WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
...@@ -19892,8 +19892,8 @@ f_charbig VARCHAR(1000) ...@@ -19892,8 +19892,8 @@ f_charbig VARCHAR(1000)
PARTITION BY LIST(ABS(MOD(f_int1,2))) PARTITION BY LIST(ABS(MOD(f_int1,2)))
SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3 SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3
(PARTITION part1 VALUES IN (0), (PARTITION part1 VALUES IN (0),
PARTITION part2 VALUES IN (1), PARTITION part2 VALUES IN (1),
PARTITION part3 VALUES IN (NULL)); PARTITION part3 VALUES IN (NULL));
INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig) INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1; WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
...@@ -23914,8 +23914,8 @@ f_charbig VARCHAR(1000) ...@@ -23914,8 +23914,8 @@ f_charbig VARCHAR(1000)
PARTITION BY LIST(ABS(MOD(f_int1,2))) PARTITION BY LIST(ABS(MOD(f_int1,2)))
SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3 SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3
(PARTITION part1 VALUES IN (0), (PARTITION part1 VALUES IN (0),
PARTITION part2 VALUES IN (1), PARTITION part2 VALUES IN (1),
PARTITION part3 VALUES IN (NULL)); PARTITION part3 VALUES IN (NULL));
INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig) INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1; WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
...@@ -27936,8 +27936,8 @@ f_charbig VARCHAR(1000) ...@@ -27936,8 +27936,8 @@ f_charbig VARCHAR(1000)
PARTITION BY LIST(ABS(MOD(f_int1,2))) PARTITION BY LIST(ABS(MOD(f_int1,2)))
SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3 SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3
(PARTITION part1 VALUES IN (0), (PARTITION part1 VALUES IN (0),
PARTITION part2 VALUES IN (1), PARTITION part2 VALUES IN (1),
PARTITION part3 VALUES IN (NULL)); PARTITION part3 VALUES IN (NULL));
INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig) INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1; WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
......
mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
View file @ ad03b65d
...@@ -3808,8 +3808,8 @@ f_charbig VARCHAR(1000) ...@@ -3808,8 +3808,8 @@ f_charbig VARCHAR(1000)
PARTITION BY LIST(ABS(MOD(f_int1,2))) PARTITION BY LIST(ABS(MOD(f_int1,2)))
SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3 SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3
(PARTITION part1 VALUES IN (0), (PARTITION part1 VALUES IN (0),
PARTITION part2 VALUES IN (1), PARTITION part2 VALUES IN (1),
PARTITION part3 VALUES IN (NULL)); PARTITION part3 VALUES IN (NULL));
INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig) INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1; WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
...@@ -8098,8 +8098,8 @@ f_charbig VARCHAR(1000) ...@@ -8098,8 +8098,8 @@ f_charbig VARCHAR(1000)
PARTITION BY LIST(ABS(MOD(f_int1,2))) PARTITION BY LIST(ABS(MOD(f_int1,2)))
SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3 SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3
(PARTITION part1 VALUES IN (0), (PARTITION part1 VALUES IN (0),
PARTITION part2 VALUES IN (1), PARTITION part2 VALUES IN (1),
PARTITION part3 VALUES IN (NULL)); PARTITION part3 VALUES IN (NULL));
INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig) INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1; WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
......
mysql-test/suite/parts/r/partition_alter1_2_innodb.result
View file @ ad03b65d
...@@ -14138,8 +14138,8 @@ f_charbig VARCHAR(1000) ...@@ -14138,8 +14138,8 @@ f_charbig VARCHAR(1000)
PARTITION BY LIST(ABS(MOD(f_int1,2))) PARTITION BY LIST(ABS(MOD(f_int1,2)))
SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3 SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3
(PARTITION part1 VALUES IN (0), (PARTITION part1 VALUES IN (0),
PARTITION part2 VALUES IN (1), PARTITION part2 VALUES IN (1),
PARTITION part3 VALUES IN (NULL)); PARTITION part3 VALUES IN (NULL));
INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig) INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1; WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
...@@ -17736,8 +17736,8 @@ f_charbig VARCHAR(1000) ...@@ -17736,8 +17736,8 @@ f_charbig VARCHAR(1000)
PARTITION BY LIST(ABS(MOD(f_int1,2))) PARTITION BY LIST(ABS(MOD(f_int1,2)))
SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3 SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3
(PARTITION part1 VALUES IN (0), (PARTITION part1 VALUES IN (0),
PARTITION part2 VALUES IN (1), PARTITION part2 VALUES IN (1),
PARTITION part3 VALUES IN (NULL)); PARTITION part3 VALUES IN (NULL));
INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig) INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1; WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
...@@ -21447,8 +21447,8 @@ f_charbig VARCHAR(1000) ...@@ -21447,8 +21447,8 @@ f_charbig VARCHAR(1000)
PARTITION BY LIST(ABS(MOD(f_int1,2))) PARTITION BY LIST(ABS(MOD(f_int1,2)))
SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3 SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3
(PARTITION part1 VALUES IN (0), (PARTITION part1 VALUES IN (0),
PARTITION part2 VALUES IN (1), PARTITION part2 VALUES IN (1),
PARTITION part3 VALUES IN (NULL)); PARTITION part3 VALUES IN (NULL));
INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig) INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1; WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
...@@ -25173,8 +25173,8 @@ f_charbig VARCHAR(1000) ...@@ -25173,8 +25173,8 @@ f_charbig VARCHAR(1000)
PARTITION BY LIST(ABS(MOD(f_int1,2))) PARTITION BY LIST(ABS(MOD(f_int1,2)))
SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3 SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3
(PARTITION part1 VALUES IN (0), (PARTITION part1 VALUES IN (0),
PARTITION part2 VALUES IN (1), PARTITION part2 VALUES IN (1),
PARTITION part3 VALUES IN (NULL)); PARTITION part3 VALUES IN (NULL));
INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig) INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1; WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
...@@ -28788,8 +28788,8 @@ f_charbig VARCHAR(1000) ...@@ -28788,8 +28788,8 @@ f_charbig VARCHAR(1000)
PARTITION BY LIST(ABS(MOD(f_int1,2))) PARTITION BY LIST(ABS(MOD(f_int1,2)))
SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3 SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3
(PARTITION part1 VALUES IN (0), (PARTITION part1 VALUES IN (0),
PARTITION part2 VALUES IN (1), PARTITION part2 VALUES IN (1),
PARTITION part3 VALUES IN (NULL)); PARTITION part3 VALUES IN (NULL));
INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig) INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1; WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
...@@ -32386,8 +32386,8 @@ f_charbig VARCHAR(1000) ...@@ -32386,8 +32386,8 @@ f_charbig VARCHAR(1000)
PARTITION BY LIST(ABS(MOD(f_int1,2))) PARTITION BY LIST(ABS(MOD(f_int1,2)))
SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3 SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3
(PARTITION part1 VALUES IN (0), (PARTITION part1 VALUES IN (0),
PARTITION part2 VALUES IN (1), PARTITION part2 VALUES IN (1),
PARTITION part3 VALUES IN (NULL)); PARTITION part3 VALUES IN (NULL));
INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig) INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1; WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
...@@ -36096,8 +36096,8 @@ f_charbig VARCHAR(1000) ...@@ -36096,8 +36096,8 @@ f_charbig VARCHAR(1000)
PARTITION BY LIST(ABS(MOD(f_int1,2))) PARTITION BY LIST(ABS(MOD(f_int1,2)))
SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3 SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3
(PARTITION part1 VALUES IN (0), (PARTITION part1 VALUES IN (0),
PARTITION part2 VALUES IN (1), PARTITION part2 VALUES IN (1),
PARTITION part3 VALUES IN (NULL)); PARTITION part3 VALUES IN (NULL));
INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig) INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1; WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
mysql-test/suite/parts/r/partition_alter1_2_myisam.result
View file @ ad03b65d
...@@ -7322,8 +7322,8 @@ f_charbig VARCHAR(1000) ...@@ -7322,8 +7322,8 @@ f_charbig VARCHAR(1000)
PARTITION BY LIST(ABS(MOD(f_int1,2))) PARTITION BY LIST(ABS(MOD(f_int1,2)))
SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3 SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3
(PARTITION part1 VALUES IN (0), (PARTITION part1 VALUES IN (0),
PARTITION part2 VALUES IN (1), PARTITION part2 VALUES IN (1),
PARTITION part3 VALUES IN (NULL)); PARTITION part3 VALUES IN (NULL));
INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig) INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1; WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
...@@ -11196,8 +11196,8 @@ f_charbig VARCHAR(1000) ...@@ -11196,8 +11196,8 @@ f_charbig VARCHAR(1000)
PARTITION BY LIST(ABS(MOD(f_int1,2))) PARTITION BY LIST(ABS(MOD(f_int1,2)))
SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3 SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3
(PARTITION part1 VALUES IN (0), (PARTITION part1 VALUES IN (0),
PARTITION part2 VALUES IN (1), PARTITION part2 VALUES IN (1),
PARTITION part3 VALUES IN (NULL)); PARTITION part3 VALUES IN (NULL));
INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig) INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1; WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
...@@ -15070,8 +15070,8 @@ f_charbig VARCHAR(1000) ...@@ -15070,8 +15070,8 @@ f_charbig VARCHAR(1000)
PARTITION BY LIST(ABS(MOD(f_int1,2))) PARTITION BY LIST(ABS(MOD(f_int1,2)))
SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3 SUBPARTITION BY KEY(f_int2) SUBPARTITIONS 3
(PARTITION part1 VALUES IN (0), (PARTITION part1 VALUES IN (0),
PARTITION part2 VALUES IN (1), PARTITION part2 VALUES IN (1),
PARTITION part3 VALUES IN (NULL)); PARTITION part3 VALUES IN (NULL));
INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig) INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1; WHERE f_int1 BETWEEN 1 AND @max_row_div2 - 1;
......
mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result 0 → 100644
View file @ ad03b65d
This diff is collapsed.
mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result 0 → 100644
View file @ ad03b65d
This diff is collapsed.
mysql-test/suite/parts/t/partition_alter2_1_innodb.test → mysql-test/suite/parts/t/partition_alter2_1_1_innodb.test
View file @ ad03b65d
################################################################################ ################################################################################
# t/partition_alter2_1_innodb.test # # t/partition_alter2_1_1_innodb.test #
# # # #
# Purpose: # # Purpose: #
# Tests around Alter column used in partitioning function # # Tests around Alter column used in partitioning function #
...@@ -39,6 +39,8 @@ SET @max_row = 20; ...@@ -39,6 +39,8 @@ SET @max_row = 20;
##### Execute more tests ##### ##### Execute more tests #####
let $more_trigger_tests= 0; let $more_trigger_tests= 0;
let $more_pk_ui_tests= 0; let $more_pk_ui_tests= 0;
# only do the first part
let $only_part_1= 1;
# The server must support partitioning. # The server must support partitioning.
--source include/have_partition.inc --source include/have_partition.inc
......
mysql-test/suite/parts/t/partition_alter2_1_2_innodb.test 0 → 100644
View file @ ad03b65d
################################################################################
# t/partition_alter2_1_2_innodb.test #
# #
# Purpose: #
# Tests around Alter column used in partitioning function #
# InnoDB branch #
# #
#------------------------------------------------------------------------------#
# Original Author: mleich #
# Original Date: 2006-03-05 #
# Change Author: #
# Change Date: #
# Change: #
################################################################################
#
# NOTE: PLEASE DO NOT ADD NOT INNODB SPECIFIC TESTCASES HERE !
# TESTCASES WHICH MUST BE APPLIED TO ALL STORAGE ENGINES MUST BE ADDED IN
# THE SOURCED FILES ONLY.
#
# Please read the README at the end of inc/partition.pre before changing
# any of the variables.
#
#------------------------------------------------------------------------------#
# General not engine specific settings and requirements
##### Options, for debugging support #####
let $debug= 0;
let $with_partitioning= 1;
##### Option, for displaying files #####
let $ls= 1;
##### Number of rows for the INSERT/UPDATE/DELETE/SELECT experiments #####
# on partioned tables
SET @max_row = 20;
##### Execute more tests #####
let $more_trigger_tests= 0;
let $more_pk_ui_tests= 0;
# only do the second part
let $only_part_2= 1;
# The server must support partitioning.
--source include/have_partition.inc
#------------------------------------------------------------------------------#
# Engine specific settings and requirements
##### Storage engine to be tested
--source include/have_innodb.inc
let $engine= 'InnoDB';
##### Execute the test of "table" files
# InnoDB has no files per PK, UI, ...
let $do_file_tests= 0;
##### Execute PRIMARY KEY tests #####
# AFAIK InnoDB clusters the table around PRIMARY KEYs.
let $do_pk_tests= 1;
##### Assign a big number smaller than the maximum value for partitions #####
# and smaller than the maximum value of SIGNED INTEGER
let $MAX_VALUE= (2147483646);
# Generate the prerequisites ($variables, @variables, tables) needed
--source suite/parts/inc/partition.pre
##### Workarounds for known open engine specific bugs
# none
#------------------------------------------------------------------------------#
# Execute the tests to be applied to all storage engines
--source suite/parts/inc/partition_alter2_1.inc
#------------------------------------------------------------------------------#
# Execute storage engine specific tests
#------------------------------------------------------------------------------#
# Cleanup
--source suite/parts/inc/partition_cleanup.inc
mysql-test/suite/parts/t/partition_alter2_2_innodb.test → mysql-test/suite/parts/t/partition_alter2_2_1_innodb.test
View file @ ad03b65d
################################################################################ ################################################################################
# t/partition_alter2_2_innodb.test # # t/partition_alter2_2_1_innodb.test #
# # # #
# Purpose: # # Purpose: #
# Tests around Alter column used in partitioning function # # Tests around Alter column used in partitioning function #
...@@ -39,6 +39,8 @@ SET @max_row = 20; ...@@ -39,6 +39,8 @@ SET @max_row = 20;
##### Execute more tests ##### ##### Execute more tests #####
let $more_trigger_tests= 0; let $more_trigger_tests= 0;
let $more_pk_ui_tests= 0; let $more_pk_ui_tests= 0;
# only do the first part
let $only_part_1= 1;
# The server must support partitioning. # The server must support partitioning.
--source include/have_partition.inc --source include/have_partition.inc
......
mysql-test/suite/parts/t/partition_alter2_2_2_innodb.test 0 → 100644
View file @ ad03b65d
################################################################################
# t/partition_alter2_2_2_innodb.test #
# #
# Purpose: #
# Tests around Alter column used in partitioning function #
# InnoDB branch #
# #
#------------------------------------------------------------------------------#
# Original Author: mleich #
# Original Date: 2006-03-05 #
# Change Author: #
# Change Date: #
# Change: #
################################################################################
#
# NOTE: PLEASE DO NOT ADD NOT INNODB SPECIFIC TESTCASES HERE !
# TESTCASES WHICH MUST BE APPLIED TO ALL STORAGE ENGINES MUST BE ADDED IN
# THE SOURCED FILES ONLY.
#
# Please read the README at the end of inc/partition.pre before changing
# any of the variables.
#
#------------------------------------------------------------------------------#
# General not engine specific settings and requirements
##### Options, for debugging support #####
let $debug= 0;
let $with_partitioning= 1;
##### Option, for displaying files #####
let $ls= 1;
##### Number of rows for the INSERT/UPDATE/DELETE/SELECT experiments #####
# on partioned tables
SET @max_row = 20;
##### Execute more tests #####
let $more_trigger_tests= 0;
let $more_pk_ui_tests= 0;
# only do the second part
let $only_part_2= 1;
# The server must support partitioning.
--source include/have_partition.inc
#------------------------------------------------------------------------------#
# Engine specific settings and requirements
##### Storage engine to be tested
--source include/have_innodb.inc
let $engine= 'InnoDB';
##### Execute the test of "table" files
# InnoDB has no files per PK, UI, ...
let $do_file_tests= 0;
##### Execute PRIMARY KEY tests #####
# AFAIK InnoDB clusters the table around PRIMARY KEYs.
let $do_pk_tests= 1;
##### Assign a big number smaller than the maximum value for partitions #####
# and smaller than the maximum value of SIGNED INTEGER
let $MAX_VALUE= (2147483646);
# Generate the prerequisites ($variables, @variables, tables) needed
--source suite/parts/inc/partition.pre
##### Workarounds for known open engine specific bugs
# none
#------------------------------------------------------------------------------#
# Execute the tests to be applied to all storage engines
--source suite/parts/inc/partition_alter2_2.inc
#------------------------------------------------------------------------------#
# Execute storage engine specific tests
#------------------------------------------------------------------------------#
# Cleanup
--source suite/parts/inc/partition_cleanup.inc
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