List:Commits« Previous MessageNext Message »
From:Luis Soares Date:November 29 2010 4:55pm
Subject:bzr commit into mysql-trunk-bugfixing branch (luis.soares:3394) Bug#58564
View as plain text  
#At file:///home/lsoares/Workspace/bzr/work/bugfixing/58564/mysql-trunk-bugfixing-push/ based on revid:jon.hauglid@stripped

 3394 Luis Soares	2010-11-29 [merge]
      BUG#58564
      
      Merging with latest mysql-trunk-bugfixing.

    modified:
      mysql-test/suite/rpl/t/rpl_checksum.test
      sql/log_event.cc
=== modified file 'mysql-test/suite/rpl/t/rpl_checksum.test'
--- a/mysql-test/suite/rpl/t/rpl_checksum.test	2010-09-28 15:42:48 +0000
+++ b/mysql-test/suite/rpl/t/rpl_checksum.test	2010-11-29 16:07:06 +0000
@@ -239,6 +239,25 @@ drop table t1, t2, t3;
 set @@global.binlog_checksum = @master_save_binlog_checksum;
 set @@global.master_verify_checksum = @save_master_verify_checksum;
 
+#
+# BUG#58564: flush_read_lock fails in mysql-trunk-bugfixing after merging with WL#2540
+#
+# Sanity check that verifies that no assertions are triggered because
+# of old FD events (generated by versions prior to server released with 
+# checksums feature)
+#
+# There is no need for query log, if something wrong this should trigger
+# an assertion
+
+--disable_query_log
+
+BINLOG '
+MfmqTA8BAAAAZwAAAGsAAAABAAQANS41LjctbTMtZGVidWctbG9nAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAx+apMEzgNAAgAEgAEBAQEEgAAVAAEGggAAAAICAgCAA==
+';
+
+--enable_query_log
+
 #connection slave;
 sync_slave_with_master;
 set @@global.binlog_checksum = @slave_save_binlog_checksum;

=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2010-11-29 16:27:58 +0000
+++ b/sql/log_event.cc	2010-11-29 16:55:45 +0000
@@ -93,11 +93,8 @@ TYPELIB binlog_checksum_typelib=
    replication event checksum is introduced in the following "checksum-home" version.
    The checksum-aware servers extract FD's version to decide whether the FD event
    carries checksum info.
-
-   TODO: correct the constant when it has been determined 
-   (which main tree to push and when) 
 */
-const uchar checksum_version_split[3]= {5, 1, 46};
+const uchar checksum_version_split[3]= {5, 6, 1};
 const ulong checksum_version_product=
   (checksum_version_split[0] * 256 + checksum_version_split[1]) * 256 +
   checksum_version_split[2];

No bundle (reason: revision is a merge).
Thread
bzr commit into mysql-trunk-bugfixing branch (luis.soares:3394) Bug#58564Luis Soares29 Nov