From a4ed105c669cf2f6d9d32d5bf33291cdbffdd70a Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 9 May 2007 10:49:11 +0200 Subject: [PATCH 1/2] Bug #28193 outfile fails randomly in pushbuild - Change "exec rm" to "remove_file" mysql-test/t/outfile.test: Change "exec rm" to "remove_file" --- mysql-test/t/outfile.test | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mysql-test/t/outfile.test b/mysql-test/t/outfile.test index 81fcc7fd564..149c92ece38 100644 --- a/mysql-test/t/outfile.test +++ b/mysql-test/t/outfile.test @@ -39,9 +39,9 @@ select load_file(concat(@tmpdir,"/outfile-test.3")); #eval select * into dumpfile "$MYSQL_TEST_DIR/var/tmp/outfile-test.3" from t1; #enable_query_log; select load_file(concat(@tmpdir,"/outfile-test.not-exist")); ---exec rm $MYSQL_TEST_DIR/var/tmp/outfile-test.1 ---exec rm $MYSQL_TEST_DIR/var/tmp/outfile-test.2 ---exec rm $MYSQL_TEST_DIR/var/tmp/outfile-test.3 +--remove_file $MYSQL_TEST_DIR/var/tmp/outfile-test.1 +--remove_file $MYSQL_TEST_DIR/var/tmp/outfile-test.2 +--remove_file $MYSQL_TEST_DIR/var/tmp/outfile-test.3 drop table t1; # Bug#8191 @@ -49,7 +49,7 @@ disable_query_log; eval select 1 into outfile "$MYSQL_TEST_DIR/var/tmp/outfile-test.4"; enable_query_log; select load_file(concat(@tmpdir,"/outfile-test.4")); ---exec rm $MYSQL_TEST_DIR/var/tmp/outfile-test.4 +--remove_file $MYSQL_TEST_DIR/var/tmp/outfile-test.4 # # Bug #5382: 'explain select into outfile' crashes the server From 67d7cd515c0f0b7ee80b0b58a23204b9761851e7 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 9 May 2007 10:52:28 +0200 Subject: [PATCH 2/2] Bug#28193 outfile fails randomly in pushbuild - Change testcase to use remove_file mysql-test/t/outfile.test: Change "exec rm" to "remove_file" --- mysql-test/t/outfile.test | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mysql-test/t/outfile.test b/mysql-test/t/outfile.test index 7c90fd32909..ea5545043e0 100644 --- a/mysql-test/t/outfile.test +++ b/mysql-test/t/outfile.test @@ -41,9 +41,9 @@ eval select * into dumpfile "../tmp/outfile-test.2" from t1; eval select * into dumpfile "../tmp/outfile-test.3" from t1; enable_query_log; select load_file(concat(@tmpdir,"/outfile-test.not-exist")); ---exec rm $MYSQLTEST_VARDIR/tmp/outfile-test.1 ---exec rm $MYSQLTEST_VARDIR/tmp/outfile-test.2 ---exec rm $MYSQLTEST_VARDIR/tmp/outfile-test.3 +--remove_file $MYSQLTEST_VARDIR/tmp/outfile-test.1 +--remove_file $MYSQLTEST_VARDIR/tmp/outfile-test.2 +--remove_file $MYSQLTEST_VARDIR/tmp/outfile-test.3 drop table t1; # Bug#8191 @@ -51,7 +51,7 @@ disable_query_log; eval select 1 into outfile "../tmp/outfile-test.4"; enable_query_log; select load_file(concat(@tmpdir,"/outfile-test.4")); ---exec rm $MYSQLTEST_VARDIR/tmp/outfile-test.4 +--remove_file $MYSQLTEST_VARDIR/tmp/outfile-test.4 # # Bug #5382: 'explain select into outfile' crashes the server @@ -75,7 +75,7 @@ eval SELECT * INTO OUTFILE "../tmp/outfile-test.4" FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"' FROM information_schema.schemata LIMIT 0, 5; # enable_query_log; ---exec rm $MYSQLTEST_VARDIR/tmp/outfile-test.4 +--remove_file $MYSQLTEST_VARDIR/tmp/outfile-test.4 use information_schema; # disable_query_log; @@ -83,7 +83,7 @@ eval SELECT * INTO OUTFILE "../tmp/outfile-test.4" FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"' FROM schemata LIMIT 0, 5; enable_query_log; ---exec rm $MYSQLTEST_VARDIR/tmp/outfile-test.4 +--remove_file $MYSQLTEST_VARDIR/tmp/outfile-test.4 use test; #