diff options
| author | mikael/pappa@dator5.(none) <> | 2006-07-17 06:41:12 -0400 |
|---|---|---|
| committer | mikael/pappa@dator5.(none) <> | 2006-07-17 06:41:12 -0400 |
| commit | 6019ac9b71df96a8f8213432f23fe081d0d7cfb9 (patch) | |
| tree | a2083f44aa78483115de2ae12ad65b11bdbf7a12 /mysql-test/t/partition.test | |
| parent | 3d442310645f76f76aa506dd919eb5343882314d (diff) | |
| download | mariadb-git-6019ac9b71df96a8f8213432f23fe081d0d7cfb9.tar.gz | |
Fixes for strange appearance of db.opt file
Diffstat (limited to 'mysql-test/t/partition.test')
| -rw-r--r-- | mysql-test/t/partition.test | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/mysql-test/t/partition.test b/mysql-test/t/partition.test index af6bce276d3..6deb8f77a58 100644 --- a/mysql-test/t/partition.test +++ b/mysql-test/t/partition.test @@ -1266,7 +1266,6 @@ drop table t1; # doesn't remove old directory # --disable_query_log ---exec rm $MYSQLTEST_VARDIR/test/db.opt || true --exec mkdir $MYSQLTEST_VARDIR/master-data/tmpdata || true eval SET @data_dir = 'DATA DIRECTORY = ''$MYSQLTEST_VARDIR/master-data/tmpdata'''; let $data_directory = `select @data_dir`; @@ -1284,11 +1283,11 @@ subpartition by hash (a) (SUBPARTITION subpart00, SUBPARTITION subpart01)); --replace_result $MYSQLTEST_VARDIR "hello" ---exec ls $MYSQLTEST_VARDIR/master-data/test t1* || true +--exec ls $MYSQLTEST_VARDIR/master-data/test/t1* || true --replace_result $MYSQLTEST_VARDIR "hello" ---exec ls $MYSQLTEST_VARDIR/master-data/tmpdata t1* || true +--exec ls $MYSQLTEST_VARDIR/master-data/tmpdata/t1* || true --replace_result $MYSQLTEST_VARDIR "hello" ---exec ls $MYSQLTEST_VARDIR/master-data/tmpinx t1* || true +--exec ls $MYSQLTEST_VARDIR/master-data/tmpinx/t1* || true --replace_result $MYSQLTEST_VARDIR "hello" eval ALTER TABLE t1 REORGANIZE PARTITION p0 INTO @@ -1298,11 +1297,11 @@ eval ALTER TABLE t1 REORGANIZE PARTITION p0 INTO (SUBPARTITION subpart20, SUBPARTITION subpart21)); --replace_result $MYSQLTEST_VARDIR "hello" ---exec ls $MYSQLTEST_VARDIR/master-data/test t1* || true +--exec ls $MYSQLTEST_VARDIR/master-data/test/t1* || true --replace_result $MYSQLTEST_VARDIR "hello" ---exec ls $MYSQLTEST_VARDIR/master-data/tmpdata t1* || true +--exec ls $MYSQLTEST_VARDIR/master-data/tmpdata/t1* || true --replace_result $MYSQLTEST_VARDIR "hello" ---exec ls $MYSQLTEST_VARDIR/master-data/tmpinx t1* || true +--exec ls $MYSQLTEST_VARDIR/master-data/tmpinx/t1* || true drop table t1; --exec rmdir $MYSQLTEST_VARDIR/master-data/tmpdata || true |