Commit 2a419a56 authored by Patrick Crews's avatar Patrick Crews
Browse files

Bug#38311 Some tests use 'rm' which is not portable 

Substituted use of MTR's remove_file function in the tests
Started with 5.0 tree and will clean up any offenders discovered during upmerge.
parent 47ba1e81

mysql-test/include/ndb_backup_print.inc

+2 −1
Original line number Diff line number Diff line 
--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults $ndb_restore_opts -b $the_backup_id -n 1 $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id $ndb_restore_filter > $MYSQLTEST_VARDIR/tmp/tmp.dat

--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults $ndb_restore_opts -b $the_backup_id -n 2 $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id $ndb_restore_filter >> $MYSQLTEST_VARDIR/tmp/tmp.dat

--exec sort $MYSQLTEST_VARDIR/tmp/tmp.dat

--exec rm -f $MYSQLTEST_VARDIR/tmp/tmp.dat

--error 0,1

--remove_file $MYSQLTEST_VARDIR/tmp/tmp.dat

--let ndb_restore_opts=

--let ndb_restore_filter=

mysql-test/t/binlog_killed_simulate.test

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ let $error_code= `select @a like "%#%error_code=0%" /* must return 1 */`; 
eval select $error_code /* must return 1 as query completed before got killed*/;



# cleanup for the sub-case

system rm $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog;

remove_file $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog;





#
@@ -58,7 +58,7 @@ let $error_code= `select @a like "%#%error_code=0%" /* must return 0*/`; 
eval select $error_code /* must return 0 to mean the killed query is in */;



# cleanup for the sub-case

system rm $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog;

remove_file $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog;





drop table t1,t2;

mysql-test/t/binlog_start_comment.test

+1 −1
Original line number Diff line number Diff line
@@ -21,4 +21,4 @@ select * from t2; 


# clean up

drop table t1,t2;

#--system rm $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog
 
#--remove_file $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog

mysql-test/t/ctype_big5.test

+2 −1
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ delete from t1; 
--eval select hex(load_file('$MYSQLTEST_VARDIR/master-data/test/t1.txt'));

load data infile 't1.txt' into table t1;

select hex(a) from t1;

--exec rm $MYSQLTEST_VARDIR/master-data/test/t1.txt

--remove_file $MYSQLTEST_VARDIR/master-data/test/t1.txt



drop table t1;



--echo End of 5.0 tests

mysql-test/t/distinct.test

+2 −2
Original line number Diff line number Diff line
@@ -492,12 +492,12 @@ DROP TABLE t1; 
#SELECT DISTINCT fruit_id, fruit_name INTO OUTFILE 

#'../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE';

#LOAD DATA INFILE '../tmp/data1.tmp' INTO TABLE t2;

#--exec rm $MYSQL_TEST_DIR/var/tmp/data1.tmp

#--remove_file $MYSQL_TEST_DIR/var/tmp/data1.tmp

#

#SELECT DISTINCT @v19:= fruit_id, @v20:= fruit_name INTO OUTFILE 

#'../tmp/data2.tmp' FROM t1 WHERE fruit_name = 'APPLE';

#LOAD DATA INFILE '../tmp/data2.tmp' INTO TABLE t2;

#--exec rm $MYSQL_TEST_DIR/var/tmp/data2.tmp

#--remove_file $MYSQL_TEST_DIR/var/tmp/data2.tmp

#

#SELECT @v19, @v20;

#SELECT * FROM t2;