From 404e4b802cc15197028f29a38f522e2711366c02 Mon Sep 17 00:00:00 2001 From: Patrick Crews Date: Sat, 20 Sep 2008 02:21:28 -0400 Subject: 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. --- mysql-test/t/distinct.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mysql-test/t/distinct.test') diff --git a/mysql-test/t/distinct.test b/mysql-test/t/distinct.test index 7310f98cd16..19147a7d9cf 100644 --- a/mysql-test/t/distinct.test +++ b/mysql-test/t/distinct.test @@ -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; -- cgit v1.2.1 From 006b940a27206ce530ae68dc7b5915b86720086e Mon Sep 17 00:00:00 2001 From: Patrick Crews Date: Tue, 30 Sep 2008 20:54:06 -0400 Subject: Bug#38311 Some tests use 'rm' which is not portable Repush of change to fix tests on Pushbuild. --- mysql-test/t/distinct.test | 1 + 1 file changed, 1 insertion(+) (limited to 'mysql-test/t/distinct.test') diff --git a/mysql-test/t/distinct.test b/mysql-test/t/distinct.test index 0b09502e342..ff232a61621 100644 --- a/mysql-test/t/distinct.test +++ b/mysql-test/t/distinct.test @@ -490,6 +490,7 @@ default NULL); 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; +--error 0,1 --remove_file $MYSQL_TEST_DIR/var/tmp/data1.tmp SELECT DISTINCT @v19:= fruit_id, @v20:= fruit_name INTO OUTFILE -- cgit v1.2.1 From ab5b7ceb971896ee73fa6187e894cb6ef2a36595 Mon Sep 17 00:00:00 2001 From: Georgi Kodinov Date: Wed, 1 Oct 2008 12:45:02 +0300 Subject: fixed a wrong directory in distinct.test --- mysql-test/t/distinct.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mysql-test/t/distinct.test') diff --git a/mysql-test/t/distinct.test b/mysql-test/t/distinct.test index ff232a61621..2cbd34c0d2c 100644 --- a/mysql-test/t/distinct.test +++ b/mysql-test/t/distinct.test @@ -491,12 +491,12 @@ 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; --error 0,1 ---remove_file $MYSQL_TEST_DIR/var/tmp/data1.tmp +--remove_file $MYSQLTEST_VARDIR/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; ---remove_file $MYSQL_TEST_DIR/var/tmp/data2.tmp +--remove_file $MYSQLTEST_VARDIR/tmp/data2.tmp SELECT @v19, @v20; SELECT * FROM t2; -- cgit v1.2.1