List:Commits« Previous MessageNext Message »
From:Luis Soares Date:December 7 2010 2:26pm
Subject:bzr commit into mysql-5.1-bugteam branch (luis.soares:3512) Bug#58416
View as plain text  
#At file:///home/lsoares/Workspace/bzr/work/bugfixing/push2/mysql-5.1-bugteam/ based on revid:mats.kindahl@stripped

 3512 Luis Soares	2010-12-07 [merge]
      BUG#58416
      
      Automerging bzr bundle from bug report into latest 
      mysql-5.1-bugteam.

    modified:
      mysql-test/extra/binlog_tests/binlog_failure_mixing_engines.test
      mysql-test/suite/binlog/r/binlog_mixed_failure_mixing_engines.result
      mysql-test/suite/binlog/r/binlog_row_failure_mixing_engines.result
=== modified file 'mysql-test/extra/binlog_tests/binlog_failure_mixing_engines.test'
--- a/mysql-test/extra/binlog_tests/binlog_failure_mixing_engines.test	2009-10-06 00:54:00 +0000
+++ b/mysql-test/extra/binlog_tests/binlog_failure_mixing_engines.test	2010-11-27 11:51:07 +0000
@@ -60,6 +60,7 @@
 # Please, remove this test case after pushing WL#2687.
 ################################################################################
 
+RESET MASTER;
 
 --echo ###################################################################################
 --echo #                                   CONFIGURATION

=== modified file 'mysql-test/suite/binlog/r/binlog_mixed_failure_mixing_engines.result'
--- a/mysql-test/suite/binlog/r/binlog_mixed_failure_mixing_engines.result	2009-10-06 00:54:00 +0000
+++ b/mysql-test/suite/binlog/r/binlog_mixed_failure_mixing_engines.result	2010-11-27 11:51:07 +0000
@@ -1,3 +1,4 @@
+RESET MASTER;
 ###################################################################################
 #                                   CONFIGURATION
 ###################################################################################

=== modified file 'mysql-test/suite/binlog/r/binlog_row_failure_mixing_engines.result'
--- a/mysql-test/suite/binlog/r/binlog_row_failure_mixing_engines.result	2009-10-06 00:54:00 +0000
+++ b/mysql-test/suite/binlog/r/binlog_row_failure_mixing_engines.result	2010-11-27 11:51:07 +0000
@@ -1,3 +1,4 @@
+RESET MASTER;
 ###################################################################################
 #                                   CONFIGURATION
 ###################################################################################

No bundle (reason: revision is a merge).
Thread
bzr commit into mysql-5.1-bugteam branch (luis.soares:3512) Bug#58416Luis Soares7 Dec