From 02421023fc939284099b4b7796b04e978034d464 Mon Sep 17 00:00:00 2001 From: Alfranio Correia Date: Fri, 24 Apr 2009 02:02:07 +0100 Subject: [PATCH 1/2] BUG#44389 rpl_row_mysqlbinlog fails on windows due to operating system specifc command Replaced "--exec rm" by "remove_file" which is a mysqltest command to erase a file. --- mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test index 62b46eeb58e..3328d582692 100644 --- a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test +++ b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test @@ -244,7 +244,7 @@ connection master; # We should be gold by the time, so I will get rid of our file. ---exec rm $MYSQLTEST_VARDIR/tmp/remote.sql +--remove_file $MYSQLTEST_VARDIR/tmp/remote.sql ################### End Bug 17654 ###################### # What is the point of this test? It seems entirely pointless. It @@ -349,9 +349,9 @@ FLUSH LOGS; --diff_files $MYSQLTEST_VARDIR/tmp/local.sql $MYSQLTEST_VARDIR/tmp/remote.sql ---exec rm $MYSQLTEST_VARDIR/tmp/remote.sql +--remove_file $MYSQLTEST_VARDIR/tmp/remote.sql ---exec rm $MYSQLTEST_VARDIR/tmp/local.sql +--remove_file $MYSQLTEST_VARDIR/tmp/local.sql DROP TABLE IF EXISTS t1, t2, t3, t04, t05, t4, t5; sync_slave_with_master; From 6309ce959401c0a49435f79b8be3800969573309 Mon Sep 17 00:00:00 2001 From: Alfranio Correia Date: Sun, 26 Apr 2009 22:21:01 +0100 Subject: [PATCH 2/2] Fixed rpl_innodb_mixed_ddl and rpl_000015. Respectively, replaced "--exec diff" by "--diff_files" which is a mysqltest command to run a non-operating system specific diff. Removed the file rpl_000015-slave.sh as it is not necessary in the new MTR. --- mysql-test/suite/rpl/include/rpl_mixed_ddl.inc | 2 +- mysql-test/suite/rpl/t/rpl_000015-slave.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100755 mysql-test/suite/rpl/t/rpl_000015-slave.sh diff --git a/mysql-test/suite/rpl/include/rpl_mixed_ddl.inc b/mysql-test/suite/rpl/include/rpl_mixed_ddl.inc index 6a00dcc6e50..70e17cef9fe 100644 --- a/mysql-test/suite/rpl/include/rpl_mixed_ddl.inc +++ b/mysql-test/suite/rpl/include/rpl_mixed_ddl.inc @@ -83,4 +83,4 @@ sync_slave_with_master; # will be created. You will need to go to the mysql-test dir and diff # the files your self to see what is not matching ---exec diff $MYSQLTEST_VARDIR/tmp/rpl_switch_stm_row_mixed_master.sql $MYSQLTEST_VARDIR/tmp/rpl_switch_stm_row_mixed_slave.sql +--diff_files $MYSQLTEST_VARDIR/tmp/rpl_switch_stm_row_mixed_master.sql $MYSQLTEST_VARDIR/tmp/rpl_switch_stm_row_mixed_slave.sql diff --git a/mysql-test/suite/rpl/t/rpl_000015-slave.sh b/mysql-test/suite/rpl/t/rpl_000015-slave.sh deleted file mode 100755 index 7deeca3d2d6..00000000000 --- a/mysql-test/suite/rpl/t/rpl_000015-slave.sh +++ /dev/null @@ -1 +0,0 @@ -rm -f $MYSQLTEST_VARDIR/slave-data/master.info