diff options
author | unknown <kostja@bodhi.local> | 2007-01-16 21:23:52 +0300 |
---|---|---|
committer | unknown <kostja@bodhi.local> | 2007-01-16 21:23:52 +0300 |
commit | 9cff68bb3b2408c8cefccaa230a527cb1a9f955e (patch) | |
tree | 98fd1508daa698c8415c9121a7088f2393ab7c8e /mysql-test/t/ps.test | |
parent | 15c834256dbe5bae7333d0695db88b658f7e3c20 (diff) | |
download | mariadb-git-9cff68bb3b2408c8cefccaa230a527cb1a9f955e.tar.gz |
A fix for the broken 4.1-runtime tree.
mysql-test/t/backup.test:
Backport a patch for sporadically failing myisam.test (and now ps.test)
from 5.0. The cause was in backup.test not cleaning up tables in
mysqltest-vardir/tmp after itself.
mysql-test/t/ps.test:
Add additional protection against possible failure in the middle of
backup.test
Diffstat (limited to 'mysql-test/t/ps.test')
-rw-r--r-- | mysql-test/t/ps.test | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test index cd6c0667898..c963e59110f 100644 --- a/mysql-test/t/ps.test +++ b/mysql-test/t/ps.test @@ -1127,7 +1127,12 @@ show create table mysqltest.t2; drop database mysqltest; deallocate prepare stmt1; 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_query_log eval prepare stmt from "create table t1 (c char(10)) data directory='$MYSQLTEST_VARDIR/tmp'"; --enable_query_log |