MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Andrei Elkin Date:October 4 2010 6:09pm
Subject:bzr push into mysql-next-mr branch (aelkin:3176 to 3177) WL#2540
View as plain text  
 3177 Andrei Elkin	2010-10-04
      wl#2540
      
      fixing an assert on 64-bit linux: retyping binlog_checksum_options to ulong.

    modified:
      sql/mysqld.cc
      sql/mysqld.h
 3176 Andrei Elkin	2010-10-04
      wl#2540
      
      making cosmetic changes in rpl_checksum_cache also to run it on pb2 to get more evidence of its failure

    modified:
      mysql-test/suite/rpl/r/rpl_checksum_cache.result
      mysql-test/suite/rpl/t/rpl_checksum_cache.test
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2010-09-28 15:06:04 +0000
+++ b/sql/mysqld.cc	2010-10-04 18:07:35 +0000
@@ -439,7 +439,7 @@ my_bool sp_automatic_privileges= 1;
 
 ulong opt_binlog_rows_event_max_size;
 const char *binlog_checksum_default= "NONE";
-uint binlog_checksum_options;
+ulong binlog_checksum_options;
 my_bool opt_master_verify_checksum= 0;
 my_bool opt_slave_sql_verify_checksum= 1;
 const char *binlog_format_names[]= {"MIXED", "STATEMENT", "ROW", NullS};

=== modified file 'sql/mysqld.h'
--- a/sql/mysqld.h	2010-09-28 13:58:50 +0000
+++ b/sql/mysqld.h	2010-10-04 18:07:35 +0000
@@ -179,7 +179,7 @@ extern ulong binlog_cache_size, open_fil
 extern ulonglong max_binlog_cache_size;
 extern ulong max_binlog_size, max_relay_log_size;
 extern ulong opt_binlog_rows_event_max_size;
-extern uint binlog_checksum_options;
+extern ulong binlog_checksum_options;
 extern const char *binlog_checksum_type_names[];
 extern my_bool opt_master_verify_checksum;
 extern my_bool opt_slave_sql_verify_checksum;


Attachment: [text/bzr-bundle] bzr/aelkin@mysql.com-20101004180735-fnu5z358k3ukhnty.bundle
Thread
bzr push into mysql-next-mr branch (aelkin:3176 to 3177) WL#2540Andrei Elkin4 Oct