#At file:///work/bzr_trees/mysql-6.0-bugteam/ based on revid:epotemkin@stripped
2810 First_name Last_name 2008-12-16 [merge]
merge
modified:
mysql-test/suite/rpl/t/disabled.def
=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def 2008-12-12 17:36:43 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def 2008-12-15 16:11:11 +0000
@@ -10,23 +10,9 @@
#
##############################################################################
-rpl_invoked_features : BUG#29020 2007-06-21 Lars Non-deterministic test case
-rpl_auto_increment_11932 : Bug#29809 2007-07-16 ingo Slave SQL errors in warnings
- file
-rpl_do_grant : BUG#32462 2007-11-16 mats Crash when replicating 4-byte encoded UTF-8 fields
-rpl_ignore_table : BUG#32462 2007-11-16 mats Crash when replicating 4-byte encoded UTF-8 fields
-rpl_auto_increment_11932 : Bug#29809 2007-07-16 ingo Slave SQL errors in warnings file
-rpl_extraColmaster_innodb : BUG#30854 : Tables name show as binary in slave err msg on vm-win2003-64-b and Solaris
-rpl_extraColmaster_myisam : BUG#30854
-rpl_view : Bug#32654: rpl_view.test fails randomly
-rpl_ndb_multi : Bug#30751: rpl_ndb_multi missing row in output
rpl_row_sp002_innodb : Bug#32673 rpl_row_sp002_innodb.test fails randomly
-rpl_ssl : Bug#32217 rpl_ssl fails with different number of records on master and slave
-rpl_row_until : Bug#28772 rpl_row_until fails in pushbuild
-rpl_log_pos : Bug#8693 Test 'rpl_log_pos' fails sometimes
-rpl_row_basic_7ndb : BUG#33360 2007-12-19 mats rpl_ndb_idempotent fails due to null field for table on slave side
-rpl_idempotency : Bug#37767 2008-07-14 alik Disabled to make 6.0 greaner (the test fails too often)
-
rpl_locktrans_innodb : Bug#37712 2008-07-17 alik Disabled to make 6.0 greaner (the test fails too often)
-rpl_temporary_errors : Bug#36968 2008-07-17 alik Disabled to make 6.0 greaner (the test fails too often)
-rpl_flushlog_loop : BUG#37733 2008-07-23 Sven disabled in 5.1-bugteam. the bug has been fixed in 5.1-rpl: please re-enable when that gets pushed to main
+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_row_until : BUG#41423 2008-12-12 sven rpl_row_until needs maintenance
+rpl_ignore_table : BUG#41424 2008-12-12 sven rpl_ignore_table fails, "could not execute write_rows event"