bzr commit into mysql-6.0-bugteam branch (zhou.li:3172)

[Leonard Zhou]

#At file:///home/zhl/mysql/rep/6.0/bug43440/ based on revid:iggy@stripped

 3172 Leonard Zhou	2009-03-26 [merge]
      Merge

    modified:
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test
=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def	2009-03-23 09:52:54 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def	2009-03-26 03:40:02 +0000
@@ -13,7 +13,6 @@
 rpl_extraColmaster_innodb  : BUG#41097 2008-12-12 sven result files for rpl_extraColmaster_myisam, rpl_extraColmaster_innodb are gone
 rpl_extraColmaster_myisam  : BUG#41097 2008-12-12 sven result files for rpl_extraColmaster_myisam, rpl_extraColmaster_innodb are gone
 rpl_binlog_corruption      : BUG#41793 2008-12-30 sven rpl_binlog_corruption disabled in main (needs new mtr)
-rpl_temp_table_mix_row     : BUG#43440 2009-03-23 joro rpl.rpl_temp_table_mix_row fails sporadicly
 rpl_extraCol_falcon        : Bug#40930 2008-11-21 johnemb rpl.rpl_extraCol_falcon fails doing STOP SLAVE (on Windows PB2)
 rpl_cross_version	   : Bug#42311 2009-01-23 aelkin
 rpl_log_pos                : Bug#42858 2009-02-14 alik rpl.rpl_log_pos fails, thus was disabled

=== modified file 'mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test'
--- a/mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test	2009-02-23 03:26:38 +0000
+++ b/mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test	2009-03-24 08:55:03 +0000
@@ -33,6 +33,10 @@ SHOW STATUS LIKE "Slave_open_temp_tables
 disconnect master;
 --connection master1
 
+# waiting DROP TEMPORARY TABLE event to be written into binlog
+let $wait_binlog_event= DROP;
+source include/wait_for_binlog_event.inc;
+
 --echo [on slave]
 sync_slave_with_master;
 


Attachment: [text/bzr-bundle] bzr/[e-mail]