some test fixes after merging 57840

mysql-test/suite/rpl/r/rpl000017.result

@@ -13,3 +13,4 @@ n
 24
 drop table t1;
 delete from mysql.user where user="replicate";
+call mtr.force_restart();

mysql-test/suite/rpl/r/rpl_slave_status.result

@@ -33,3 +33,4 @@ Slave_IO_Running = No (should be No)
 DROP TABLE t1;
 [on master]
 DROP TABLE t1;
+call mtr.force_restart();

mysql-test/suite/rpl/t/rpl000017.test

@@ -31,4 +31,6 @@ drop table t1;
 delete from mysql.user where user="replicate";
 sync_slave_with_master;
 
+call mtr.force_restart();
+
 # End of 4.1 tests

mysql-test/suite/rpl/t/rpl_bug33931-master.opt

@@ -0,0 +1 @@
+--force-restart

mysql-test/suite/rpl/t/rpl_heartbeat-master.opt

@@ -0,0 +1 @@
+--force-restart

mysql-test/suite/rpl/t/rpl_ip_mix-master.opt

@@ -0,0 +1 @@
+--force-restart

mysql-test/suite/rpl/t/rpl_ip_mix2-master.opt

@@ -0,0 +1 @@
+--force-restart

mysql-test/suite/rpl/t/rpl_semi_sync-master.opt

@@ -1 +1,2 @@
 $SEMISYNC_PLUGIN_OPT
+--force-restart

mysql-test/suite/rpl/t/rpl_slave_status.test

@@ -68,3 +68,4 @@ DROP TABLE t1;
 --echo [on master]
 connection master;
 DROP TABLE t1;
+call mtr.force_restart();

mysql-test/suite/rpl/t/rpl_sync.test

@@ -150,3 +150,4 @@ source include/diff_tables.inc;
 --echo =====Clean up=======;
 connection master;
 drop table t1;
+--remove_file $MYSQLD_SLAVE_DATADIR/master.backup

mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt

@@ -1,3 +1,2 @@
 --loose-debug="+d,all_errors_are_temporary_errors" --slave-transaction-retries=2
-
-
+--force-restart

mysql-test/t/union.test

@@ -1062,7 +1062,7 @@ SELECT ( SELECT a UNION SELECT a ) INTO OUTFILE  'union.out.file3' FROM t1;
 SELECT ( SELECT a UNION SELECT a ) INTO DUMPFILE 'union.out.file4' FROM t1;
 
 DROP TABLE t1;
-
+remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.1/data/test union.out.fil*;
 
 --echo # 
 --echo # Bug #49734: Crash on EXPLAIN EXTENDED UNION ... ORDER BY