Skip to content

M
MariaDB
Commit 1e0b8f74 authored by Mikael Ronstrom's avatar Mikael Ronstrom
Browse files
Options

Fixed two test cases for extended partitioning tests

parent 2c38ed0d
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 8 deletions
mysql-test/suite/parts/r/partition_syntax_innodb.result
View file @ 1e0b8f74
...@@ -764,7 +764,7 @@ f_char2 CHAR(20), ...@@ -764,7 +764,7 @@ f_char2 CHAR(20),
f_charbig VARCHAR(1000) ) f_charbig VARCHAR(1000) )
PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (20), PARTITION part3 VALUES LESS THAN (2147483646) PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (20), PARTITION part3 VALUES LESS THAN (2147483646)
(SUBPARTITION subpart31 , SUBPARTITION subpart32 )) ; (SUBPARTITION subpart31 , SUBPARTITION subpart32 )) ;
ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near '))' at line 7 ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near 'SUBPARTITION subpart31 , SUBPARTITION subpart32 ))' at line 7
CREATE TABLE t1 ( f_int1 INTEGER, CREATE TABLE t1 ( f_int1 INTEGER,
f_int2 INTEGER, f_int2 INTEGER,
f_char1 CHAR(20), f_char1 CHAR(20),
...@@ -772,7 +772,7 @@ f_char2 CHAR(20), ...@@ -772,7 +772,7 @@ f_char2 CHAR(20),
f_charbig VARCHAR(1000) ) f_charbig VARCHAR(1000) )
PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (20) PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (20)
(SUBPARTITION subpart21 , SUBPARTITION subpart22 ), PARTITION part3 VALUES LESS THAN (2147483646)) ; (SUBPARTITION subpart21 , SUBPARTITION subpart22 ), PARTITION part3 VALUES LESS THAN (2147483646)) ;
ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near '), PARTITION part3 VALUES LESS THAN (2147483646))' at line 7 ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near 'SUBPARTITION subpart21 , SUBPARTITION subpart22 ), PARTITION part3 VALUES LESS T' at line 7
CREATE TABLE t1 ( f_int1 INTEGER, CREATE TABLE t1 ( f_int1 INTEGER,
f_int2 INTEGER, f_int2 INTEGER,
f_char1 CHAR(20), f_char1 CHAR(20),
...@@ -781,8 +781,7 @@ f_charbig VARCHAR(1000) ) ...@@ -781,8 +781,7 @@ f_charbig VARCHAR(1000) )
PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (20) PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (20)
(SUBPARTITION subpart21 , SUBPARTITION subpart22 ), PARTITION part3 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 , SUBPARTITION subpart22 ), PARTITION part3 VALUES LESS THAN (2147483646)
(SUBPARTITION subpart31 , SUBPARTITION subpart32 )) ; (SUBPARTITION subpart31 , SUBPARTITION subpart32 )) ;
ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near '), PARTITION part3 VALUES LESS THAN (2147483646) ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near 'SUBPARTITION subpart21 , SUBPARTITION subpart22 ), PARTITION part3 VALUES LESS T' at line 7
(SUBPARTITION subpart31 , SUBPA' at line 7
CREATE TABLE t1 ( f_int1 INTEGER, CREATE TABLE t1 ( f_int1 INTEGER,
f_int2 INTEGER, f_int2 INTEGER,
f_char1 CHAR(20), f_char1 CHAR(20),
......
mysql-test/suite/parts/r/partition_syntax_myisam.result
View file @ 1e0b8f74
...@@ -796,7 +796,7 @@ f_char2 CHAR(20), ...@@ -796,7 +796,7 @@ f_char2 CHAR(20),
f_charbig VARCHAR(1000) ) f_charbig VARCHAR(1000) )
PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (20), PARTITION part3 VALUES LESS THAN (2147483646) PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (20), PARTITION part3 VALUES LESS THAN (2147483646)
(SUBPARTITION subpart31 , SUBPARTITION subpart32 )) ; (SUBPARTITION subpart31 , SUBPARTITION subpart32 )) ;
ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near '))' at line 7 ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near 'SUBPARTITION subpart31 , SUBPARTITION subpart32 ))' at line 7
CREATE TABLE t1 ( f_int1 INTEGER, CREATE TABLE t1 ( f_int1 INTEGER,
f_int2 INTEGER, f_int2 INTEGER,
f_char1 CHAR(20), f_char1 CHAR(20),
...@@ -804,7 +804,7 @@ f_char2 CHAR(20), ...@@ -804,7 +804,7 @@ f_char2 CHAR(20),
f_charbig VARCHAR(1000) ) f_charbig VARCHAR(1000) )
PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (20) PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (20)
(SUBPARTITION subpart21 , SUBPARTITION subpart22 ), PARTITION part3 VALUES LESS THAN (2147483646)) ; (SUBPARTITION subpart21 , SUBPARTITION subpart22 ), PARTITION part3 VALUES LESS THAN (2147483646)) ;
ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near '), PARTITION part3 VALUES LESS THAN (2147483646))' at line 7 ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near 'SUBPARTITION subpart21 , SUBPARTITION subpart22 ), PARTITION part3 VALUES LESS T' at line 7
CREATE TABLE t1 ( f_int1 INTEGER, CREATE TABLE t1 ( f_int1 INTEGER,
f_int2 INTEGER, f_int2 INTEGER,
f_char1 CHAR(20), f_char1 CHAR(20),
...@@ -813,8 +813,7 @@ f_charbig VARCHAR(1000) ) ...@@ -813,8 +813,7 @@ f_charbig VARCHAR(1000) )
PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (20) PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (20)
(SUBPARTITION subpart21 , SUBPARTITION subpart22 ), PARTITION part3 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 , SUBPARTITION subpart22 ), PARTITION part3 VALUES LESS THAN (2147483646)
(SUBPARTITION subpart31 , SUBPARTITION subpart32 )) ; (SUBPARTITION subpart31 , SUBPARTITION subpart32 )) ;
ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near '), PARTITION part3 VALUES LESS THAN (2147483646) ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near 'SUBPARTITION subpart21 , SUBPARTITION subpart22 ), PARTITION part3 VALUES LESS T' at line 7
(SUBPARTITION subpart31 , SUBPA' at line 7
CREATE TABLE t1 ( f_int1 INTEGER, CREATE TABLE t1 ( f_int1 INTEGER,
f_int2 INTEGER, f_int2 INTEGER,
f_char1 CHAR(20), f_char1 CHAR(20),
......
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