From: Andrei Elkin
Date: December 28 2010 2:22pm
Subject: bzr commit into mysql-trunk branch (andrei.elkin:3446)
List-Archive: http://lists.mysql.com/commits/127626
Message-Id: <201012281422.oBSEMtIw009414@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1628955025=="

--===============1628955025==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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;


--===============1628955025==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/andrei.elkin@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: andrei.elkin@stripped
# target_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-5.6.1-\
#   m5-release/
# testament_sha1: b5160b5c5064996b960760afd3390468f5a23ab6
# timestamp: 2010-12-28 16:22:55 +0200
# base_revision_id: alexander.nozdrin@stripped\
#   y0t3ibtd32wd9qaw
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWy69KMAAo3fgFAQcGP///+v
/CC////0UAV5PW3baG1zTqoOqdxhJJNBqDRMyZCntNJqZGhk9T1BptTCbU2psoEpTEGmmRNGJAbU
BoGRoANAAASJCaJT8RoaU8iPUNAANAA0AADmAIwTEAwCYJoyGhgEwRiYSSBTE0wTE0NFT9pTanlT
NTQADEDQZMFMv26+HJvxkfK7YfAhf6UUg38nCV2tJVJzsm+BjO2kZChfeXHpr1rNNtttfT4h+J1x
huZhBqIhukRJuWOW5j4+fgq+Cy8vLJQo2SvMJs3X2SYrcg5q97UqrCmMtQomEtd2kbPoodx0szF8
JzgAZwl5hGKyu8P0hCi+GeaoWqUpfC74jjBAV70h6coleKtrmW9XRSVNnowPeDyXg6JgQyAkcnZe
yBSUBlHhoIiUgFScJkqjpdFKmpeI0q/CKtSmahHjdvZqHoYBz6LzmWZ2E74XTgFJGz6FTIkpfDJ5
U9FVZtENBv9q3DRspKym6yfZrR5BHfQopSApYq1T7wpTUwY3lhGwixssonBwYIjTYWfy6JIcQmQr
RDEcdOASKQSET5CjIxHREMnsr3uFxL30zDFiKFtHlBGKoXOoinSE4RI19d+RgLJCqhHpgbMjUxI+
8HVUjEaDPGIJhE840OENDC1iMhiuBYai5YzVUkSY1A1BreslwEaVbLHG/ywpuEbqyXALz5tLviq+
plspy1EWOkYUjiZbZm2szw60K0hwnC00vlmayepFUTWPGOeKrI0BmO4vPNdVDY43EaSNTkTlW4Li
8mMi6B7SMGI1HWxN24ysWjcyx5PM0Sw2W0KDXLyy/jCWX6xYQYocyEEWVUj6icsLRbUmjcmmVQPo
uXCjqtEBdSSHW+LAoKtrtfk3eYPV2+5xWK7C2SbaHn7V09L4EqS2cuNWCVkwzJ8frwHeMz5N/7ph
A53PGCHrJ/PQPS8uN18JTlNHc9fKEOXVB3LFTQduVy1JhbizURWeMgk0QvMwDKdm/y84wzEZw5VH
RA0HMrBpxIAt8kWiBXIL6rdOm8sqqk95vW0pBlDjmU7XVjQeA6iwnGxdy23Ckq7iI3LUPH3TcSaC
mlhm45M62/lBziwlpdJzBrs7Ha1jyPeK8/aR2ueHlU/W5ATIDbf+oiNC95gY2PLVSZJ5uZDysgiZ
9W9TJRESZYqiyj2h0SApvgm/gO/rDzGBF9ehaVw7Gp5bcN1LZ69cjPQ3EV4XXTDQyc4xrCLqsKc0
d8xxWx4La6Gn811grHRZ2t/riTUkUODamR3Dhujyidcx0BhVnyEb1MlL06VrYdTZvMTfxix6S3oG
0J17F3XhKtYOLTuKYOzo5FSTn0p65LNXlgDBzpd4EbrRZcEyQx0EOsKU1nf50p3TODkErkEDHXBM
gKe6T3Q9XC6F4p8j0C2GyK0zEZXFpkyTcd5QoMImBYi7iMuU/L2ByCwV0BkpVVUAxTqHPCRuz6SX
hjqA77eBtAM3SxRUaTALy1aCJzoppgnTTkTWFTlZASdzUzxNHvaRPeTgt1yA5lCvVJmhJtDWnjkt
5XNLm7XBIJxeIjpEBFlHyQDCpWTlIrxVdax3MmQ8PXLHmnCNeclqhWU0r1eaqChdcAzFRwE4ckjx
xBK2IhCnasDCWukaDWA5K0zouSqh2eFE4YxB2Qu0FhFKT66+x97Lh2bNMRUxkWATK+ivp6CCmWGc
uCa+6OegvtZ89ijetorhTmNSfIY9AruhPl9mEslddFfTsgOkZHNUFqbYcGwYmPdnvrAWrnCzEyow
qsDWol1xCMwvcIwXRYaBoI7nMNviYRUVc19NQVdC8/8XckU4UJBsuvSj


--===============1628955025==--