From 9cff68bb3b2408c8cefccaa230a527cb1a9f955e Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 16 Jan 2007 21:23:52 +0300 Subject: [PATCH] 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 --- mysql-test/t/backup.test | 1 + mysql-test/t/ps.test | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/mysql-test/t/backup.test b/mysql-test/t/backup.test index b6b3ef1c060..0f1881368a9 100644 --- a/mysql-test/t/backup.test +++ b/mysql-test/t/backup.test @@ -51,5 +51,6 @@ unlock tables; connection con1; reap; drop table t5; +--system rm $MYSQLTEST_VARDIR/tmp/t?.* # End of 4.1 tests 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