diff options
Diffstat (limited to 'mysql-test/t/backup.test')
| -rw-r--r-- | mysql-test/t/backup.test | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/mysql-test/t/backup.test b/mysql-test/t/backup.test index 0f1881368a9..b05eef6a3ad 100644 --- a/mysql-test/t/backup.test +++ b/mysql-test/t/backup.test @@ -1,3 +1,8 @@ + +# The server need to be started in $MYSQLTEST_VARDIR since it +# uses ../std_data_ln/ +-- source include/uses_vardir.inc + # # This test is a bit tricky as we can't use backup table to overwrite an old # table @@ -10,10 +15,10 @@ set SQL_LOG_BIN=0; drop table if exists t1, t2, t3; --enable_warnings create table t4(n int); ---replace_result "errno: 1" "errno: X" "errno: 2" "errno: X" "errno: 22" "errno: X" "errno: 23" "errno: X" +--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 "errno: 7" "errno: X" "errno: 17" "errno: X" +--replace_result ": 7" ": X" ": 17" ": X" $MYSQLTEST_VARDIR MYSQLTEST_VARDIR backup table t4 to '../tmp'; drop table t4; restore table t4 from '../tmp'; @@ -23,6 +28,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" $MYSQLTEST_VARDIR MYSQLTEST_VARDIR restore table t1 from '../bogus'; restore table t1 from '../tmp'; select n from t1; @@ -51,6 +57,15 @@ unlock tables; connection con1; reap; drop table t5; ---system rm $MYSQLTEST_VARDIR/tmp/t?.* +remove_file $MYSQLTEST_VARDIR/tmp/t1.MYD; +remove_file $MYSQLTEST_VARDIR/tmp/t2.MYD; +remove_file $MYSQLTEST_VARDIR/tmp/t3.MYD; +remove_file $MYSQLTEST_VARDIR/tmp/t4.MYD; +remove_file $MYSQLTEST_VARDIR/tmp/t5.MYD; +remove_file $MYSQLTEST_VARDIR/tmp/t1.frm; +remove_file $MYSQLTEST_VARDIR/tmp/t2.frm; +remove_file $MYSQLTEST_VARDIR/tmp/t3.frm; +remove_file $MYSQLTEST_VARDIR/tmp/t4.frm; +remove_file $MYSQLTEST_VARDIR/tmp/t5.frm; # End of 4.1 tests |