Commit 9cff68bb authored by unknown's avatar unknown

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
parent 15c83425
...@@ -51,5 +51,6 @@ unlock tables; ...@@ -51,5 +51,6 @@ unlock tables;
connection con1; connection con1;
reap; reap;
drop table t5; drop table t5;
--system rm $MYSQLTEST_VARDIR/tmp/t?.*
# End of 4.1 tests # End of 4.1 tests
...@@ -1127,7 +1127,12 @@ show create table mysqltest.t2; ...@@ -1127,7 +1127,12 @@ show create table mysqltest.t2;
drop database mysqltest; drop database mysqltest;
deallocate prepare stmt1; deallocate prepare stmt1;
deallocate prepare stmt2; deallocate prepare stmt2;
#
# CREATE TABLE with DATA DIRECTORY option # 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 --disable_query_log
eval prepare stmt from "create table t1 (c char(10)) data directory='$MYSQLTEST_VARDIR/tmp'"; eval prepare stmt from "create table t1 (c char(10)) data directory='$MYSQLTEST_VARDIR/tmp'";
--enable_query_log --enable_query_log
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment