BUG#17339: Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave

For this particular bug report it was rpl_loadfile.test that did not make proper cleanup, but the patch
includes fixes for other tests aswell.


mysql-test/r/rpl_loaddata2.result:
  Cleanup
mysql-test/r/rpl_redirect.result:
  Cleanup
mysql-test/r/rpl_slave_status.result:
  Cleanup
mysql-test/t/rpl_LD_INFILE.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_drop_temp.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_ignore_table.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loaddata2.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loaddata_m.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loaddata_s.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loadfile.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_multi_update4.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_ndb_basic.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_redirect.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_func001.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_func002.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp001.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp005.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp008.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp009.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp010.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp011.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp012.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_trig001.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_trig002.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_skip_error.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_slave_status.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_sp.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_sp004.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave

1 files changed, 3 insertions, 4 deletions

diff --git a/mysql-test/t/rpl_row_trig002.test b/mysql-test/t/rpl_row_trig002.test
index d2a1b6327dd..7ca8a68f060 100644
--- a/mysql-test/t/rpl_row_trig002.test
+++ b/mysql-test/t/rpl_row_trig002.test
@@ -67,15 +67,14 @@ save_master_pos;
 connection slave;
 sync_with_master;
 SELECT * FROM test.t1 ORDER BY id;
-connection master;
 
+# Cleanup
+connection master;
 #show binlog events; 
-
-# cleanup
-
 DROP TRIGGER test.t2_ai;
 DROP TABLE test.t1;
 DROP TABLE test.t2;
 DROP TABLE test.t3;
+sync_slave_with_master;
 
 # End of 5.0 test case