Commit d364bf85 authored by unknown's avatar unknown
Browse files

BUG#17339: Most rpl tests need to execute sync_slave_with_master to ensure... 

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
parent a5fda39d

mysql-test/r/rpl_loaddata2.result

+1 −0
Original line number Diff line number Diff line
@@ -150,3 +150,4 @@ Aberdeen 
Abernathy

aberrant

aberration

drop table t1;

mysql-test/r/rpl_redirect.result

+0 −1
Original line number Diff line number Diff line
@@ -39,4 +39,3 @@ n 
4

5

drop table t1;
 
drop table t1;

mysql-test/r/rpl_slave_status.result

+1 −0
Original line number Diff line number Diff line
@@ -53,3 +53,4 @@ Master_SSL_Cipher 
Master_SSL_Key	

Seconds_Behind_Master	NULL

drop table t1;

drop table t1;

mysql-test/t/rpl_LD_INFILE.test

+4 −3
Original line number Diff line number Diff line
@@ -27,11 +27,12 @@ save_master_pos; 
sync_slave_with_master;

connection slave;

SELECT * FROM test.t1 ORDER BY a DESC;

connection master;

# Lets cleanup

#show binlog events;



# Cleanup

#show binlog events;

connection master;

DROP TABLE test.t1;

sync_slave_with_master;



# End of 5.0 test case

mysql-test/t/rpl_drop_temp.test

+3 −0
Original line number Diff line number Diff line
@@ -18,7 +18,10 @@ disconnect master; 
connection slave;

--real_sleep 3 # time for DROP to be written

show status like 'Slave_open_temp_tables';



# Cleanup

connection default;

drop database mysqltest;

sync_slave_with_master;



# End of 4.1 tests