From 120f848f75ccbfb4f7aa1db3b0ac5dca8028a7d9 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Mon, 6 Nov 2017 21:00:06 +0000 Subject: [PATCH] Fix test case --- mysql-test/suite/mariabackup/partition_datadir.result | 4 ++-- mysql-test/suite/mariabackup/partition_datadir.test | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mysql-test/suite/mariabackup/partition_datadir.result b/mysql-test/suite/mariabackup/partition_datadir.result index b5113156068..3fc5fe30907 100644 --- a/mysql-test/suite/mariabackup/partition_datadir.result +++ b/mysql-test/suite/mariabackup/partition_datadir.result @@ -3,8 +3,8 @@ ENGINE=InnoDB PARTITION BY RANGE (i) (PARTITION p0 VALUES LESS THAN (100), PARTITION P1 VALUES LESS THAN (200), -PARTITION p2 VALUES LESS THAN (300) DATA DIRECTORY = "D:/work/10.1/xxx/mysql-test/var/partitdata", -PARTITION p3 VALUES LESS THAN (400) DATA DIRECTORY = "D:/work/10.1/xxx/mysql-test/var/partitdata", +PARTITION p2 VALUES LESS THAN (300) DATA DIRECTORY = 'MYSQLTEST_VARDIR/partitdata', +PARTITION p3 VALUES LESS THAN (400) DATA DIRECTORY = 'MYSQLTEST_VARDIR/partitdata', PARTITION p4 VALUES LESS THAN MAXVALUE); INSERT INTO t VALUES (1), (101), (201), (301), (401); DROP TABLE t; diff --git a/mysql-test/suite/mariabackup/partition_datadir.test b/mysql-test/suite/mariabackup/partition_datadir.test index 4c814184b0b..882b0111267 100644 --- a/mysql-test/suite/mariabackup/partition_datadir.test +++ b/mysql-test/suite/mariabackup/partition_datadir.test @@ -1,13 +1,15 @@ let $targetdir=$MYSQLTEST_VARDIR/backup; mkdir $targetdir; mkdir $MYSQLTEST_VARDIR/partitdata; + +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval CREATE TABLE t(i int) ENGINE=InnoDB PARTITION BY RANGE (i) (PARTITION p0 VALUES LESS THAN (100), PARTITION P1 VALUES LESS THAN (200), - PARTITION p2 VALUES LESS THAN (300) DATA DIRECTORY = "$MYSQLTEST_VARDIR/partitdata", - PARTITION p3 VALUES LESS THAN (400) DATA DIRECTORY = "$MYSQLTEST_VARDIR/partitdata", + PARTITION p2 VALUES LESS THAN (300) DATA DIRECTORY = '$MYSQLTEST_VARDIR/partitdata', + PARTITION p3 VALUES LESS THAN (400) DATA DIRECTORY = '$MYSQLTEST_VARDIR/partitdata', PARTITION p4 VALUES LESS THAN MAXVALUE); INSERT INTO t VALUES (1), (101), (201), (301), (401); exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$targetdir;