diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-09-17 20:01:38 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-09-18 10:40:26 +0200 |
| commit | a5ee77393f93e6b609ae2db53ed683404fd0d588 (patch) | |
| tree | 62beadf9f1e3efba6a0de709c69f7856ace8a487 /mysql-test/suite | |
| parent | be3490f01f4a3f1df393305c2b29bf07ac8a2564 (diff) | |
| download | mariadb-git-a5ee77393f93e6b609ae2db53ed683404fd0d588.tar.gz | |
MDEV-13157 Specifying DATA DIRECTORY in tables leads to failing EXCHANGE PARTITION
Diffstat (limited to 'mysql-test/suite')
| -rw-r--r-- | mysql-test/suite/parts/r/partition_exch_qa_14.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/parts/t/partition_exch_qa_14.test | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/mysql-test/suite/parts/r/partition_exch_qa_14.result b/mysql-test/suite/parts/r/partition_exch_qa_14.result index bdbf18bddb5..1420982436a 100644 --- a/mysql-test/suite/parts/r/partition_exch_qa_14.result +++ b/mysql-test/suite/parts/r/partition_exch_qa_14.result @@ -55,7 +55,6 @@ CREATE TABLE tsp_03(a INT,b VARCHAR(55),PRIMARY KEY (a)) ENGINE = MYISAM DATA DI CREATE TABLE tsp_04(a INT,b VARCHAR(55),PRIMARY KEY (a)) ENGINE = MYISAM DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' AS SELECT a, b FROM t_10 WHERE MOD(a,5)= 4; CREATE TABLE tsp_00(a INT,b VARCHAR(55),PRIMARY KEY (a)) ENGINE = MYISAM DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' AS SELECT a, b FROM t_10 WHERE MOD(a,5)= 0; ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10; -ERROR HY000: Tables have different definitions DROP TABLE IF EXISTS t_10; DROP TABLE IF EXISTS t_100; DROP TABLE IF EXISTS t_1000; @@ -125,7 +124,7 @@ CREATE TABLE tsp_03(a INT,b VARCHAR(55),PRIMARY KEY (a)) ENGINE = MYISAM AS SE CREATE TABLE tsp_04(a INT,b VARCHAR(55),PRIMARY KEY (a)) ENGINE = MYISAM AS SELECT a, b FROM t_10 WHERE MOD(a,5)= 4; CREATE TABLE tsp_00(a INT,b VARCHAR(55),PRIMARY KEY (a)) ENGINE = MYISAM AS SELECT a, b FROM t_10 WHERE MOD(a,5)= 0; ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10; -ERROR HY000: Non matching attribute 'DATA DIRECTORY' between partition and table +ERROR HY000: Tables have different definitions DROP TABLE IF EXISTS t_10; DROP TABLE IF EXISTS t_100; DROP TABLE IF EXISTS t_1000; diff --git a/mysql-test/suite/parts/t/partition_exch_qa_14.test b/mysql-test/suite/parts/t/partition_exch_qa_14.test index 94d1b9593da..8d9f201f1db 100644 --- a/mysql-test/suite/parts/t/partition_exch_qa_14.test +++ b/mysql-test/suite/parts/t/partition_exch_qa_14.test @@ -19,7 +19,6 @@ echo # === Data/Index directories are identical; let $p_index_directory= INDEX DIRECTORY = '$idx_dir_path'; let $index_directory= INDEX DIRECTORY = '$idx_dir_path'; source suite/parts/inc/part_exch_tabs.inc; - error ER_TABLES_DIFFERENT_METADATA; ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10; source suite/parts/inc/part_exch_drop_tabs.inc; @@ -29,7 +28,7 @@ echo # === partition has directories, the table does not; let $p_index_directory= INDEX DIRECTORY = '$idx_dir_path'; let $index_directory= ; source suite/parts/inc/part_exch_tabs.inc; - error ER_PARTITION_EXCHANGE_DIFFERENT_OPTION; + error ER_TABLES_DIFFERENT_METADATA; ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10; source suite/parts/inc/part_exch_drop_tabs.inc; |