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

--===============2133301672==
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
      an experimental commit to fixing bug59179.

    modified:
      sql/binlog.cc
      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:17:31 +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/sys_vars.cc'
--- a/sql/sys_vars.cc	2010-12-20 13:26:51 +0000
+++ b/sql/sys_vars.cc	2010-12-28 14:17:31 +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;


--===============2133301672==
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: 05e93dcda736dfb74cede4495ca1ebcea2ddd1d5
# timestamp: 2010-12-28 16:17:39 +0200
# base_revision_id: alexander.nozdrin@stripped\
#   y0t3ibtd32wd9qaw
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWf8ebj0AAg9fgFAQcGP/9/+v
/CC////0UATZPAUZqaQAQJJIak9Mpsp6YjJNqbQp5NQ9QaMJppppoz1QOYExNBhMmTJkYTBNNMjE
wBDANCam0SnlPQjNI00A8oAaZNA9TCPUAOYExNBhMmTJkYTBNNMjEwBDAJJCGUxoBDQmmhMUenqn
pNAADQ0NJyUTXcO5Mg0XRmEWP+UsGFI0AE+mmKwc5oSJQCQfDsd8ZxtAzMzLVYBarbKGaz3FVxyO
RTZ7S3rNT7BTaNf7blIWQS2+/jZVvYzlJVKNmrCBhF8eVreej1uZuUP2hWqLTozRmW483AZW0Uka
fU991GA4qEprLEDk+fMY3xLzGhIt73OMT4M5kkwlBx1x/mJmalBkPJEnMG1PTjh63U0UxJYLqYK1
osnPPosAvPZUfUyFdM5l/GQ599SFKfVbMig2z3vH7wyAwHt8ZvkBbvzq7L9WNpacBi0vHm7mXKqN
2BvctTeyS0if5GT01jk5fG9wHpiUVNbqFO4aADCs0vhBHIjbIwJMQVxI0HQAoJEJK2sZWysrWROq
ZdSdFmOAn0K5kIB3EByCxXvuIdxlcxxppGL2iSkYqPEC0hOTEq8acrC+WVgftpy1visNB0X4FWvH
nZ2TVTklHUxk1TqXjjvktIyO63DjsjcEWLRsOeZca2FxZ3vOpQB4JmO0g+wuYJHQxO0wVURtB2bA
Vmg5batuLilszO+zCAP+RedIga7MC1i6wGWNpSURMSgfamqkQer0AWWXFM84DYQmg4A2xI8pCDQO
GHIWaqveE44BecYB8ecVVLFiBd3594KGMGDMLJ9WhPaCv16b8YitFDBH6P/XmHnKvWSGPEYckWP0
8Y48OmN2FFVPZY4vGR3l18F2h4EDDlUFWMhN0DxB18rhliO0WXAROlE7iGUUSl6aaSGF+z/LicyY
iwrMjSKdLwdzWGRqO5ce2Q6zs7TH3xDDy0hHkBippbCq1fHrS6BchN3ncbTaeAvGE2SwLXmgqcJV
CV1/aUMtgxbhxgdi1MbfLAIGWZsCGvwUUP0Rk0Cp56oVCIxb03kbOlcGAOWooM8U5K+Sc8LPErIj
cdEr9DDnTmRG/n/JwimyEG3HVby6pKWf5HERp3Q7Gj9XFNaCty3ZpwSDfup4lHSI6AyJm5eUUU7u
XO89QOXQ4mq9hCW9QbFQyPU8zBEzJx8w7xUj2OfuuE7iBMeeZicBMq25XI3cBkDDWRTWeXzoi6py
5FMxNAy73phKzlqEH+muL8kbN21EydB2+mJuNfQiUiNqONPH1XILEVOC0fUVCTBCoPc5BjhyDq7e
OAdZHbihZNRUqCyljIyMCJzKqlExAdIhSVk3F9AJ3YUvQwfiyCG0gOIuR5rItKIbEmYGV3DAvqzD
x3gEUecB1BdL/hJkVrxcqJ6KczEDTawwbgKF7fCXMt5UkaMJzPl6K9bDQ5IlwE4ckHj5iNIAWz7t
qx2URcyjuK1ge4fVdZ7Z1yCXTTs5j6bPDb1hX6T9/vzesiaGLA07uIHlIkXzK0Na6iec22eqhgNY
Rjsua5RPo0hjtIcVsxoxOkRKqhnsE9ZpG4/xpqG3Wyqa43GmhlTOswGdK9Qrq6iFbwK3C1Ae4Cxa
1ZwOBeVyTgTk+pfOdT6ys/4u5IpwoSH+PNx6


--===============2133301672==--