diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-05-09 10:49:52 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-05-09 10:49:52 +0200 |
| commit | 575e5f68eeca2cac722308cf69b47a00937ddc99 (patch) | |
| tree | 0a9183fc3573bb28add1c0fdccf8bd73f339427c /mysql-test | |
| parent | ef7a956659b877529066ab8eaaedd6e35c07805c (diff) | |
| parent | a4ed105c669cf2f6d9d32d5bf33291cdbffdd70a (diff) | |
| download | mariadb-git-575e5f68eeca2cac722308cf69b47a00937ddc99.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug28193/my41-bug28193
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/t/outfile.test | 8 |
1 files 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 |