bzr commit into mysql-trunk branch (andrei.elkin:3446)

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/2a-23May/mysql-5.6.1-m5-release/ based on revid:alexander.nozdrin@stripped

 3446 Andrei Elkin	2010-12-28
      trial commit to fix bug59179

    modified:
      sql/binlog.cc
      sql/binlog.h
      sql/sys_vars.cc
=== modified file 'sql/binlog.cc'
--- a/sql/binlog.cc	2010-12-17 02:01:32 +0000
+++ b/sql/binlog.cc	2010-12-28 14:22:51 +0000
@@ -3483,7 +3483,7 @@ unlock:
   @retval
     nonzero - error 
 */
-int MYSQL_BIN_LOG::rotate_and_purge(uint flags)
+int MYSQL_BIN_LOG::rotate_and_purge(uchar flags)
 {
   int error= 0;
   DBUG_ENTER("MYSQL_BIN_LOG::rotate_and_purge");

=== modified file 'sql/binlog.h'
--- a/sql/binlog.h	2010-12-10 16:55:50 +0000
+++ b/sql/binlog.h	2010-12-28 14:22:51 +0000
@@ -219,7 +219,7 @@ public:
   void make_log_name(char* buf, const char* log_ident);
   bool is_active(const char* log_file_name);
   int update_log_index(LOG_INFO* linfo, bool need_update_threads);
-  int rotate_and_purge(uint flags);
+  int rotate_and_purge(uchar flags);
   /**
      Flush binlog cache and synchronize to disk.
 

=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	2010-12-20 13:26:51 +0000
+++ b/sql/sys_vars.cc	2010-12-28 14:22:51 +0000
@@ -1941,8 +1941,8 @@ bool Sys_var_enum_binlog_checksum::globa
   mysql_mutex_lock(mysql_bin_log.get_log_lock());
   if(mysql_bin_log.is_open())
   {
-    uint flags= RP_FORCE_ROTATE | RP_LOCK_LOG_IS_ALREADY_LOCKED |
-      (binlog_checksum_options != (uint) var->save_result.ulonglong_value?
+    uchar flags= RP_FORCE_ROTATE | RP_LOCK_LOG_IS_ALREADY_LOCKED |
+      (binlog_checksum_options != (uchar) var->save_result.ulonglong_value?
        RP_BINLOG_CHECKSUM_ALG_CHANGE : 0);
     if (flags & RP_BINLOG_CHECKSUM_ALG_CHANGE)
       mysql_bin_log.checksum_alg_reset= (uint8) var->save_result.ulonglong_value;


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