Change "exec rm" to "remove_file"

mysql-test/t/sp.test:
  Change "exec rm" to "remove_file"
  Change two "remove file if exists" to "check that file not exist"

2 files changed, 9 insertions, 5 deletions

diff --git a/mysql-test/include/have_outfile.inc b/mysql-test/include/have_outfile.inc
index 10f093ec3ef..ae4a2723840 100644
--- a/mysql-test/include/have_outfile.inc
+++ b/mysql-test/include/have_outfile.inc
@@ -1,5 +1,5 @@
 -- require r/have_outfile.require
 disable_query_log;
 select load_file(concat(@tmpdir,"/outfile.test"));
---exec rm $MYSQLTEST_VARDIR/tmp/outfile.test
+--remove_file $MYSQLTEST_VARDIR/tmp/outfile.test
 enable_query_log;
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index c94a526e10c..460c10d88d0 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -705,9 +705,11 @@ begin
   insert into test.t1 values (concat(x, "2"), y+2);
 end|
 
---system rm -f $MYSQLTEST_VARDIR/tmp/spout
+# Check that file does not exists
+--error 1
+--file_exists $MYSQLTEST_VARDIR/tmp/spout
 call into_outfile("ofile", 1)|
---system rm -f $MYSQLTEST_VARDIR/tmp/spout
+--remove_file $MYSQLTEST_VARDIR/tmp/spout
 delete from t1|
 drop procedure into_outfile|
 
@@ -722,9 +724,11 @@ begin
   insert into test.t1 values (concat(x, "2"), y+2);
 end|
 
---system rm -f $MYSQLTEST_VARDIR/tmp/spdump
+# Check that file does not exists
+--error 1
+--file_exists $MYSQLTEST_VARDIR/tmp/spdump
 call into_dumpfile("dfile", 1)|
---system rm -f $MYSQLTEST_VARDIR/tmp/spdump
+--remove_file $MYSQLTEST_VARDIR/tmp/spdump
 delete from t1|
 drop procedure into_dumpfile|