diff options
| author | unknown <msvensson@pilot.(none)> | 2007-08-29 12:47:28 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-08-29 12:47:28 +0200 |
| commit | 024bd2f612825cd36c93775728f56856e5f28267 (patch) | |
| tree | 1fe1110677c433df0181054e2ef62230a57028f3 /mysql-test/t | |
| parent | 6d0cc3ca7cdcfaec43668014df5292e967bc6922 (diff) | |
| parent | cf37bc45fcba6f31b2cd50328f0443f120a48609 (diff) | |
| download | mariadb-git-024bd2f612825cd36c93775728f56856e5f28267.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
mysql-test/t/backup.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/backup.test | 11 | ||||
| -rw-r--r-- | mysql-test/t/ps.test | 3 |
2 files changed, 10 insertions, 4 deletions
diff --git a/mysql-test/t/backup.test b/mysql-test/t/backup.test index 0b4b9b84094..cdbf7b69615 100644 --- a/mysql-test/t/backup.test +++ b/mysql-test/t/backup.test @@ -57,7 +57,16 @@ 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 # End of 5.0 tests diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test index 5a4d30fdd50..dea86bdd2fa 100644 --- a/mysql-test/t/ps.test +++ b/mysql-test/t/ps.test @@ -1181,9 +1181,6 @@ deallocate prepare stmt2; # # CREATE TABLE with DATA DIRECTORY option # -# Protect ourselves from data left in tmp/ by a previos possibly failed -# test ---system rm -f $MYSQLTEST_VARDIR/tmp/t1.* --disable_warnings --disable_query_log eval prepare stmt from "create table t1 (c char(10)) data directory='$MYSQLTEST_VARDIR/tmp'"; |