diff options
| author | msvensson@neptunus.(none) <> | 2006-01-24 14:10:48 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-01-24 14:10:48 +0100 |
| commit | 60296f8f7f45971d1b46f4aa18edcaa79d752f8e (patch) | |
| tree | 7ac44dab0ce589c83d422e1c0871efa3c3e492ff /mysql-test/t/backup.test | |
| parent | 57c432b94ebc59206b3aa68217369ebc34142f8a (diff) | |
| parent | 09ec2919a1f7b2ef65623ecf62014210f7d74fac (diff) | |
| download | mariadb-git-60296f8f7f45971d1b46f4aa18edcaa79d752f8e.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var
Diffstat (limited to 'mysql-test/t/backup.test')
| -rw-r--r-- | mysql-test/t/backup.test | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/t/backup.test b/mysql-test/t/backup.test index 64de3a426b2..917c3f98ebb 100644 --- a/mysql-test/t/backup.test +++ b/mysql-test/t/backup.test @@ -13,10 +13,10 @@ set SQL_LOG_BIN=0; drop table if exists t1, t2, t3, t4; --enable_warnings create table t4(n int); ---replace_result ": 1" ": X" ": 2" ": X" ": 22" ": X" ": 23" ": X" $MYSQL_TEST_DIR MYSQL_TEST_DIR +--replace_result ": 1" ": X" ": 2" ": X" ": 22" ": X" ": 23" ": X" $MYSQLTEST_VARDIR MYSQLTEST_VARDIR backup table t4 to '../bogus'; backup table t4 to '../tmp'; ---replace_result ": 7" ": X" ": 17" ": X" $MYSQL_TEST_DIR MYSQL_TEST_DIR +--replace_result ": 7" ": X" ": 17" ": X" $MYSQLTEST_VARDIR MYSQLTEST_VARDIR backup table t4 to '../tmp'; drop table t4; restore table t4 from '../tmp'; @@ -26,7 +26,7 @@ create table t1(n int); insert into t1 values (23),(45),(67); backup table t1 to '../tmp'; drop table t1; ---replace_result ": 1" ": X" ": 2" ": X" ": 22" ": X" ": 23" ": X" $MYSQL_TEST_DIR MYSQL_TEST_DIR +--replace_result ": 1" ": X" ": 2" ": X" ": 22" ": X" ": 23" ": X" $MYSQLTEST_VARDIR MYSQLTEST_VARDIR restore table t1 from '../bogus'; restore table t1 from '../tmp'; select n from t1; @@ -55,6 +55,6 @@ unlock tables; connection con1; reap; drop table t5; ---system rm $MYSQL_TEST_DIR/var/tmp/t?.* +--system rm $MYSQLTEST_VARDIR/tmp/t?.* # End of 4.1 tests |