Merge bk-internal:/home/bk/mysql-5.0-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint

1 files changed, 5 insertions, 2 deletions

diff --git a/mysql-test/t/bootstrap.test b/mysql-test/t/bootstrap.test
index 1c2952e93d0..203ba9b2914 100644
--- a/mysql-test/t/bootstrap.test
+++ b/mysql-test/t/bootstrap.test
@@ -9,12 +9,13 @@ drop table if exists t1;
 #
 # Check that --bootstrap reads from stdin
 #
---write_file $MYSQLTEST_VARDIR/tmp/bootstrap.sql
+--write_file $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql
 use test;
 CREATE TABLE t1(a int);
 EOF
---exec $MYSQLD_BOOTSTRAP_CMD < $MYSQLTEST_VARDIR/tmp/bootstrap.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1
+--exec $MYSQLD_BOOTSTRAP_CMD < $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1
 drop table t1;
+remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql;
 
 #
 # Check that --bootstrap of file with SQL error returns error
@@ -28,6 +29,7 @@ EOF
 # Table t1 should not exists
 --error 1051
 drop table t1;
+remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_error.sql;
 
 #
 # Bootstrap with a query larger than 2*thd->net.max_packet
@@ -40,6 +42,7 @@ eval select * into outfile '$MYSQLTEST_VARDIR/tmp/long_query.sql' from t1;
 --enable_query_log
 --error 1
 --exec $MYSQLD_BOOTSTRAP_CMD < $MYSQLTEST_VARDIR/tmp/long_query.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1
+remove_file $MYSQLTEST_VARDIR/tmp/long_query.sql;
 
 set global max_allowed_packet=@my_max_allowed_packet;
 drop table t1;