From 3a1e8226e7c2de8ea9cdd752fcd156cee619acec Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Thu, 1 Aug 2013 22:13:06 +0400 Subject: [PATCH] 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 --- .../suite/parts/r/partition_mgm_lc2_archive.result | 10 +++++----- .../suite/parts/r/partition_mgm_lc2_innodb.result | 10 +++++----- .../suite/parts/r/partition_mgm_lc2_memory.result | 10 +++++----- .../suite/parts/r/partition_mgm_lc2_myisam.result | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/mysql-test/suite/parts/r/partition_mgm_lc2_archive.result b/mysql-test/suite/parts/r/partition_mgm_lc2_archive.result index e71803fcac9..d8eef0f0ee2 100644 --- a/mysql-test/suite/parts/r/partition_mgm_lc2_archive.result +++ b/mysql-test/suite/parts/r/partition_mgm_lc2_archive.result @@ -32,7 +32,7 @@ ALTER TABLE TableA ADD PARTITION (PARTITION partA, PARTITION Parta, PARTITION PartA); -ERROR HY000: Duplicate partition name parta +ERROR HY000: Duplicate partition name partA ALTER TABLE TableA ADD PARTITION (PARTITION partE, PARTITION Partf, @@ -228,7 +228,7 @@ PARTITION BY HASH (a) PARTITION partA , PARTITION Parta , PARTITION PartA ); -ERROR HY000: Duplicate partition name parta +ERROR HY000: Duplicate partition name partA # Creating Hash partitioned table CREATE TABLE TableA (a INT) ENGINE = 'Archive' @@ -259,7 +259,7 @@ ALTER TABLE TableA ADD PARTITION (PARTITION partA, PARTITION Parta, PARTITION PartA); -ERROR HY000: Duplicate partition name parta +ERROR HY000: Duplicate partition name partA ALTER TABLE TableA ADD PARTITION (PARTITION partE, PARTITION Partf, @@ -475,7 +475,7 @@ a # expecting duplicate partition name ALTER TABLE TableA ADD PARTITION (PARTITION partA VALUES LESS THAN (MAXVALUE)); -ERROR HY000: Duplicate partition name parta +ERROR HY000: Duplicate partition name partA ALTER TABLE TableA ADD PARTITION (PARTITION partE VALUES LESS THAN (16), PARTITION Partf VALUES LESS THAN (19), @@ -698,7 +698,7 @@ a # expecting duplicate partition name ALTER TABLE TableA ADD PARTITION (PARTITION partA VALUES IN (0)); -ERROR HY000: Duplicate partition name parta +ERROR HY000: Duplicate partition name partA ALTER TABLE TableA ADD PARTITION (PARTITION partE VALUES IN (16), PARTITION Partf VALUES IN (19), diff --git a/mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result b/mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result index 8e42bc9eb62..8ca72703180 100644 --- a/mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result +++ b/mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result @@ -32,7 +32,7 @@ ALTER TABLE TableA ADD PARTITION (PARTITION partA, PARTITION Parta, PARTITION PartA); -ERROR HY000: Duplicate partition name parta +ERROR HY000: Duplicate partition name partA ALTER TABLE TableA ADD PARTITION (PARTITION partE, PARTITION Partf, @@ -228,7 +228,7 @@ PARTITION BY HASH (a) PARTITION partA , PARTITION Parta , PARTITION PartA ); -ERROR HY000: Duplicate partition name parta +ERROR HY000: Duplicate partition name partA # Creating Hash partitioned table CREATE TABLE TableA (a INT) ENGINE = 'InnoDB' @@ -259,7 +259,7 @@ ALTER TABLE TableA ADD PARTITION (PARTITION partA, PARTITION Parta, PARTITION PartA); -ERROR HY000: Duplicate partition name parta +ERROR HY000: Duplicate partition name partA ALTER TABLE TableA ADD PARTITION (PARTITION partE, PARTITION Partf, @@ -475,7 +475,7 @@ a # expecting duplicate partition name ALTER TABLE TableA ADD PARTITION (PARTITION partA VALUES LESS THAN (MAXVALUE)); -ERROR HY000: Duplicate partition name parta +ERROR HY000: Duplicate partition name partA ALTER TABLE TableA ADD PARTITION (PARTITION partE VALUES LESS THAN (16), PARTITION Partf VALUES LESS THAN (19), @@ -698,7 +698,7 @@ a # expecting duplicate partition name ALTER TABLE TableA ADD PARTITION (PARTITION partA VALUES IN (0)); -ERROR HY000: Duplicate partition name parta +ERROR HY000: Duplicate partition name partA ALTER TABLE TableA ADD PARTITION (PARTITION partE VALUES IN (16), PARTITION Partf VALUES IN (19), diff --git a/mysql-test/suite/parts/r/partition_mgm_lc2_memory.result b/mysql-test/suite/parts/r/partition_mgm_lc2_memory.result index 24047912ab1..7d44a5ca23f 100644 --- a/mysql-test/suite/parts/r/partition_mgm_lc2_memory.result +++ b/mysql-test/suite/parts/r/partition_mgm_lc2_memory.result @@ -32,7 +32,7 @@ ALTER TABLE TableA ADD PARTITION (PARTITION partA, PARTITION Parta, PARTITION PartA); -ERROR HY000: Duplicate partition name parta +ERROR HY000: Duplicate partition name partA ALTER TABLE TableA ADD PARTITION (PARTITION partE, PARTITION Partf, @@ -228,7 +228,7 @@ PARTITION BY HASH (a) PARTITION partA , PARTITION Parta , PARTITION PartA ); -ERROR HY000: Duplicate partition name parta +ERROR HY000: Duplicate partition name partA # Creating Hash partitioned table CREATE TABLE TableA (a INT) ENGINE = 'Memory' @@ -259,7 +259,7 @@ ALTER TABLE TableA ADD PARTITION (PARTITION partA, PARTITION Parta, PARTITION PartA); -ERROR HY000: Duplicate partition name parta +ERROR HY000: Duplicate partition name partA ALTER TABLE TableA ADD PARTITION (PARTITION partE, PARTITION Partf, @@ -475,7 +475,7 @@ a # expecting duplicate partition name ALTER TABLE TableA ADD PARTITION (PARTITION partA VALUES LESS THAN (MAXVALUE)); -ERROR HY000: Duplicate partition name parta +ERROR HY000: Duplicate partition name partA ALTER TABLE TableA ADD PARTITION (PARTITION partE VALUES LESS THAN (16), PARTITION Partf VALUES LESS THAN (19), @@ -698,7 +698,7 @@ a # expecting duplicate partition name ALTER TABLE TableA ADD PARTITION (PARTITION partA VALUES IN (0)); -ERROR HY000: Duplicate partition name parta +ERROR HY000: Duplicate partition name partA ALTER TABLE TableA ADD PARTITION (PARTITION partE VALUES IN (16), PARTITION Partf VALUES IN (19), diff --git a/mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result b/mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result index 7a61a811ea3..7b6b7864711 100644 --- a/mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result +++ b/mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result @@ -32,7 +32,7 @@ ALTER TABLE TableA ADD PARTITION (PARTITION partA, PARTITION Parta, PARTITION PartA); -ERROR HY000: Duplicate partition name parta +ERROR HY000: Duplicate partition name partA ALTER TABLE TableA ADD PARTITION (PARTITION partE, PARTITION Partf, @@ -228,7 +228,7 @@ PARTITION BY HASH (a) PARTITION partA , PARTITION Parta , PARTITION PartA ); -ERROR HY000: Duplicate partition name parta +ERROR HY000: Duplicate partition name partA # Creating Hash partitioned table CREATE TABLE TableA (a INT) ENGINE = 'MyISAM' @@ -259,7 +259,7 @@ ALTER TABLE TableA ADD PARTITION (PARTITION partA, PARTITION Parta, PARTITION PartA); -ERROR HY000: Duplicate partition name parta +ERROR HY000: Duplicate partition name partA ALTER TABLE TableA ADD PARTITION (PARTITION partE, PARTITION Partf, @@ -475,7 +475,7 @@ a # expecting duplicate partition name ALTER TABLE TableA ADD PARTITION (PARTITION partA VALUES LESS THAN (MAXVALUE)); -ERROR HY000: Duplicate partition name parta +ERROR HY000: Duplicate partition name partA ALTER TABLE TableA ADD PARTITION (PARTITION partE VALUES LESS THAN (16), PARTITION Partf VALUES LESS THAN (19), @@ -698,7 +698,7 @@ a # expecting duplicate partition name ALTER TABLE TableA ADD PARTITION (PARTITION partA VALUES IN (0)); -ERROR HY000: Duplicate partition name parta +ERROR HY000: Duplicate partition name partA ALTER TABLE TableA ADD PARTITION (PARTITION partE VALUES IN (16), PARTITION Partf VALUES IN (19),