bzr commit into mysql-5.1-bugteam branch (alfranio.correia:2861)

[Alfranio Correia]

#At file:///home/acorreia/workspace.sun/repository.mysql/bzrwork/bug-41793/mysql-5.1-bugteam-push/ based on revid:satya.bn@stripped

 2861 Alfranio Correia	2009-04-15 [merge]
      auto-merge 5.1-bugteam --> 5.1-bugteam (local)

    modified:
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/suite/rpl/t/rpl_binlog_corruption.test
=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def	2009-04-01 09:57:34 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def	2009-04-15 11:43:17 +0000
@@ -10,5 +10,4 @@
 #
 ##############################################################################
 
-rpl_binlog_corruption : BUG#41793 2008-12-30 sven rpl_binlog_corruption disabled in main (needs new mtr)
 rpl_cross_version      : BUG#42311 2009-03-27 joro rpl_cross_version fails on macosx

=== modified file 'mysql-test/suite/rpl/t/rpl_binlog_corruption.test'
--- a/mysql-test/suite/rpl/t/rpl_binlog_corruption.test	2008-12-29 16:04:10 +0000
+++ b/mysql-test/suite/rpl/t/rpl_binlog_corruption.test	2009-04-15 11:43:17 +0000
@@ -34,6 +34,7 @@ source include/setup_fake_relay_log.inc;
 
 --echo ==== Test ====
 START SLAVE SQL_THREAD;
+let $slave_sql_errno= 1594; # ER_SLAVE_RELAY_LOG_READ_FAILURE
 source include/wait_for_slave_sql_error.inc;
 let $error= query_get_value(SHOW SLAVE STATUS, Last_SQL_Error, 1);
 --echo Last_SQL_Error = $error


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