1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

MDEV-4786 - merge 10.0-monty - 10.0

Fixed parts.partition_mgm_lc2_innodb, parts.partition_mgm_lc2_archive,
parts.partition_mgm_lc2_memory, parts.partition_mgm_lc2_myisam failures.

Applied lost changes from revision
mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t

mysql-test/suite/parts/r/partition_mgm_lc2_archive.result:
  Applied lost changes from revision
  mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t
mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result:
  Applied lost changes from revision
  mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t
mysql-test/suite/parts/r/partition_mgm_lc2_memory.result:
  Applied lost changes from revision
  mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t
mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result:
  Applied lost changes from revision
  mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t
This commit is contained in:
Sergey Vojtovich
2013-08-01 22:13:06 +04:00
parent bd68d38cc7
commit 3a1e8226e7
4 changed files with 20 additions and 20 deletions

View File

@ -32,7 +32,7 @@ ALTER TABLE TableA ADD PARTITION
(PARTITION partA, (PARTITION partA,
PARTITION Parta, PARTITION Parta,
PARTITION PartA); PARTITION PartA);
ERROR HY000: Duplicate partition name parta ERROR HY000: Duplicate partition name partA
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partE, (PARTITION partE,
PARTITION Partf, PARTITION Partf,
@ -228,7 +228,7 @@ PARTITION BY HASH (a)
PARTITION partA , PARTITION partA ,
PARTITION Parta , PARTITION Parta ,
PARTITION PartA ); PARTITION PartA );
ERROR HY000: Duplicate partition name parta ERROR HY000: Duplicate partition name partA
# Creating Hash partitioned table # Creating Hash partitioned table
CREATE TABLE TableA (a INT) CREATE TABLE TableA (a INT)
ENGINE = 'Archive' ENGINE = 'Archive'
@ -259,7 +259,7 @@ ALTER TABLE TableA ADD PARTITION
(PARTITION partA, (PARTITION partA,
PARTITION Parta, PARTITION Parta,
PARTITION PartA); PARTITION PartA);
ERROR HY000: Duplicate partition name parta ERROR HY000: Duplicate partition name partA
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partE, (PARTITION partE,
PARTITION Partf, PARTITION Partf,
@ -475,7 +475,7 @@ a
# expecting duplicate partition name # expecting duplicate partition name
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partA VALUES LESS THAN (MAXVALUE)); (PARTITION partA VALUES LESS THAN (MAXVALUE));
ERROR HY000: Duplicate partition name parta ERROR HY000: Duplicate partition name partA
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partE VALUES LESS THAN (16), (PARTITION partE VALUES LESS THAN (16),
PARTITION Partf VALUES LESS THAN (19), PARTITION Partf VALUES LESS THAN (19),
@ -698,7 +698,7 @@ a
# expecting duplicate partition name # expecting duplicate partition name
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partA VALUES IN (0)); (PARTITION partA VALUES IN (0));
ERROR HY000: Duplicate partition name parta ERROR HY000: Duplicate partition name partA
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partE VALUES IN (16), (PARTITION partE VALUES IN (16),
PARTITION Partf VALUES IN (19), PARTITION Partf VALUES IN (19),

View File

@ -32,7 +32,7 @@ ALTER TABLE TableA ADD PARTITION
(PARTITION partA, (PARTITION partA,
PARTITION Parta, PARTITION Parta,
PARTITION PartA); PARTITION PartA);
ERROR HY000: Duplicate partition name parta ERROR HY000: Duplicate partition name partA
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partE, (PARTITION partE,
PARTITION Partf, PARTITION Partf,
@ -228,7 +228,7 @@ PARTITION BY HASH (a)
PARTITION partA , PARTITION partA ,
PARTITION Parta , PARTITION Parta ,
PARTITION PartA ); PARTITION PartA );
ERROR HY000: Duplicate partition name parta ERROR HY000: Duplicate partition name partA
# Creating Hash partitioned table # Creating Hash partitioned table
CREATE TABLE TableA (a INT) CREATE TABLE TableA (a INT)
ENGINE = 'InnoDB' ENGINE = 'InnoDB'
@ -259,7 +259,7 @@ ALTER TABLE TableA ADD PARTITION
(PARTITION partA, (PARTITION partA,
PARTITION Parta, PARTITION Parta,
PARTITION PartA); PARTITION PartA);
ERROR HY000: Duplicate partition name parta ERROR HY000: Duplicate partition name partA
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partE, (PARTITION partE,
PARTITION Partf, PARTITION Partf,
@ -475,7 +475,7 @@ a
# expecting duplicate partition name # expecting duplicate partition name
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partA VALUES LESS THAN (MAXVALUE)); (PARTITION partA VALUES LESS THAN (MAXVALUE));
ERROR HY000: Duplicate partition name parta ERROR HY000: Duplicate partition name partA
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partE VALUES LESS THAN (16), (PARTITION partE VALUES LESS THAN (16),
PARTITION Partf VALUES LESS THAN (19), PARTITION Partf VALUES LESS THAN (19),
@ -698,7 +698,7 @@ a
# expecting duplicate partition name # expecting duplicate partition name
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partA VALUES IN (0)); (PARTITION partA VALUES IN (0));
ERROR HY000: Duplicate partition name parta ERROR HY000: Duplicate partition name partA
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partE VALUES IN (16), (PARTITION partE VALUES IN (16),
PARTITION Partf VALUES IN (19), PARTITION Partf VALUES IN (19),

View File

@ -32,7 +32,7 @@ ALTER TABLE TableA ADD PARTITION
(PARTITION partA, (PARTITION partA,
PARTITION Parta, PARTITION Parta,
PARTITION PartA); PARTITION PartA);
ERROR HY000: Duplicate partition name parta ERROR HY000: Duplicate partition name partA
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partE, (PARTITION partE,
PARTITION Partf, PARTITION Partf,
@ -228,7 +228,7 @@ PARTITION BY HASH (a)
PARTITION partA , PARTITION partA ,
PARTITION Parta , PARTITION Parta ,
PARTITION PartA ); PARTITION PartA );
ERROR HY000: Duplicate partition name parta ERROR HY000: Duplicate partition name partA
# Creating Hash partitioned table # Creating Hash partitioned table
CREATE TABLE TableA (a INT) CREATE TABLE TableA (a INT)
ENGINE = 'Memory' ENGINE = 'Memory'
@ -259,7 +259,7 @@ ALTER TABLE TableA ADD PARTITION
(PARTITION partA, (PARTITION partA,
PARTITION Parta, PARTITION Parta,
PARTITION PartA); PARTITION PartA);
ERROR HY000: Duplicate partition name parta ERROR HY000: Duplicate partition name partA
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partE, (PARTITION partE,
PARTITION Partf, PARTITION Partf,
@ -475,7 +475,7 @@ a
# expecting duplicate partition name # expecting duplicate partition name
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partA VALUES LESS THAN (MAXVALUE)); (PARTITION partA VALUES LESS THAN (MAXVALUE));
ERROR HY000: Duplicate partition name parta ERROR HY000: Duplicate partition name partA
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partE VALUES LESS THAN (16), (PARTITION partE VALUES LESS THAN (16),
PARTITION Partf VALUES LESS THAN (19), PARTITION Partf VALUES LESS THAN (19),
@ -698,7 +698,7 @@ a
# expecting duplicate partition name # expecting duplicate partition name
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partA VALUES IN (0)); (PARTITION partA VALUES IN (0));
ERROR HY000: Duplicate partition name parta ERROR HY000: Duplicate partition name partA
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partE VALUES IN (16), (PARTITION partE VALUES IN (16),
PARTITION Partf VALUES IN (19), PARTITION Partf VALUES IN (19),

View File

@ -32,7 +32,7 @@ ALTER TABLE TableA ADD PARTITION
(PARTITION partA, (PARTITION partA,
PARTITION Parta, PARTITION Parta,
PARTITION PartA); PARTITION PartA);
ERROR HY000: Duplicate partition name parta ERROR HY000: Duplicate partition name partA
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partE, (PARTITION partE,
PARTITION Partf, PARTITION Partf,
@ -228,7 +228,7 @@ PARTITION BY HASH (a)
PARTITION partA , PARTITION partA ,
PARTITION Parta , PARTITION Parta ,
PARTITION PartA ); PARTITION PartA );
ERROR HY000: Duplicate partition name parta ERROR HY000: Duplicate partition name partA
# Creating Hash partitioned table # Creating Hash partitioned table
CREATE TABLE TableA (a INT) CREATE TABLE TableA (a INT)
ENGINE = 'MyISAM' ENGINE = 'MyISAM'
@ -259,7 +259,7 @@ ALTER TABLE TableA ADD PARTITION
(PARTITION partA, (PARTITION partA,
PARTITION Parta, PARTITION Parta,
PARTITION PartA); PARTITION PartA);
ERROR HY000: Duplicate partition name parta ERROR HY000: Duplicate partition name partA
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partE, (PARTITION partE,
PARTITION Partf, PARTITION Partf,
@ -475,7 +475,7 @@ a
# expecting duplicate partition name # expecting duplicate partition name
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partA VALUES LESS THAN (MAXVALUE)); (PARTITION partA VALUES LESS THAN (MAXVALUE));
ERROR HY000: Duplicate partition name parta ERROR HY000: Duplicate partition name partA
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partE VALUES LESS THAN (16), (PARTITION partE VALUES LESS THAN (16),
PARTITION Partf VALUES LESS THAN (19), PARTITION Partf VALUES LESS THAN (19),
@ -698,7 +698,7 @@ a
# expecting duplicate partition name # expecting duplicate partition name
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partA VALUES IN (0)); (PARTITION partA VALUES IN (0));
ERROR HY000: Duplicate partition name parta ERROR HY000: Duplicate partition name partA
ALTER TABLE TableA ADD PARTITION ALTER TABLE TableA ADD PARTITION
(PARTITION partE VALUES IN (16), (PARTITION partE VALUES IN (16),
PARTITION Partf VALUES IN (19), PARTITION Partf VALUES IN (19),