From: Andrei Elkin
Date: October 27 2010 2:51pm
Subject: bzr commit into mysql-next-mr branch (andrei.elkin:3186) Bug#57589
List-Archive: http://lists.mysql.com/commits/122112
X-Bug: 57589
Message-Id: <201010271451.o9REpFvk005461@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1180690650=="

--===============1180690650==
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/WL/mysql-next-mr-wl2540/ based on revid:andrei.elkin@stripped

 3186 Andrei Elkin	2010-10-27
      Bug #57589 SHOW SLAVE STATUS doesnt show err:1665 on NM-OS when slave cant handle checksum
      
      fixing the first patch copy-not-pasted`s goto err and the text for a new warning on the master

    modified:
      sql/rpl_master.cc
=== modified file 'sql/rpl_master.cc'
--- a/sql/rpl_master.cc	2010-10-27 10:23:24 +0000
+++ b/sql/rpl_master.cc	2010-10-27 14:51:07 +0000
@@ -818,9 +818,10 @@ impossible position";
            my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG;
            errmsg= "Slave can not handle replication events with the checksum "
              "that master is configured to log";
-           sql_print_warning("Configured to log replication events with "
-                             "checksum Master rejects sending them to Slave "
-                             "that can not handle it.");
+           sql_print_warning("Master is configured to log replication events "
+                             "with checksum, but will not send such events to "
+                             "slaves that cannot process them");
+           goto err;
          }
          binlog_can_be_corrupted= test((*packet)[FLAGS_OFFSET+ev_offset] &
                                        LOG_EVENT_BINLOG_IN_USE_F);
@@ -918,9 +919,9 @@ impossible position";
           my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG;
           errmsg= "Slave can not handle replication events with the checksum "
             "that master is configured to log";
-          sql_print_warning("Configured to log replication events with "
-                            "checksum Master rejects sending them to Slave "
-                            "that can not handle it.");
+          sql_print_warning("Master is configured to log replication events "
+                            "with checksum, but will not send such events to "
+                            "slaves that cannot process them");
           goto err;
         }
         binlog_can_be_corrupted= test((*packet)[FLAGS_OFFSET+ev_offset] &


--===============1180690650==
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/WL/mysql-next-\
#   mr-wl2540/
# testament_sha1: 9a280f04d9e6db5e7db2fa0da45c568c2f3d2ccb
# timestamp: 2010-10-27 17:51:15 +0300
# source_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/5.6.99-\
#   next-rm-wl2540-checksum/
# base_revision_id: andrei.elkin@stripped\
#   3202zwbzalo09c46
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQIv40IAAcf/gAGQAGBYZ///
ckePgP////BQBEb2tdRuPdbx5exmEojUKbI01PTRqem1RoxGgNA00ANNAEpJkniGmmiamNRoeoAA
AAAAEkjQITSj9TTEYoA0PRAeo0DT1NA0GSRM1NBpo0aGg00AAAAAAEkiaNJgFT9DRqPSnlPKHqA9
QMg0DTQiSuBjPXCVelljR2UBIWVR0ICruLjxzRM6hARyJP8quu7e75VFU9vM2NHOxS97JfVWkjXF
3c2w4S6eZ6lIvdV/GwHJlOP+tH8YFimrs7TwbKSsokCCxuLOXk5SiDFlsTrDTl1Y5ZNwOg/0Dkef
m5zqLxvZgTm8qHCHBZlNe9U8RW4cj1shhkckEQrRDdm3Gr0RIlnI5xkxRAjxHjaVhKaQKvxMQLBp
iLkuAalO8Jfdsc+HedLUNtmCrnCAi48mQtOw5sY0i9oxbTkuswF+65Wc4V2142FNeyq2ibAFtDnk
SadIM6ANhAiPJRGNlzBOMk2YGjaLzMMSesFg3AfUpsPlySIUH4KCxH4TAOysrB5IbDXAgYdV1F0c
BVO2+EuqkxDKUwgdmih9yECkHPBYlypZCcgZxk+BgJB8HPa1ZdKCNYyZKlcgmauwgOEqFiDSxNle
d4y9GsIxSRiJCFZKhL0/hINVFWWpkMtiKXTRNSNS/Fc48iF1s0b80IzyQjyReTUwgOQTTZywTo1u
BjwOjd0cuaMDxfTfNI7eO+t6op4P2tPqNl4f07Nu1kk231aibCoZUPTUwVzdEIg5c5DMcmUXnt1Z
kQp3XB3xhVgamiUMxviu+sKc99DsRdZoQlFesZamnetr67Tqntl6m04MRgDoQkSOU0hcL2Qa4lgN
Zzr1CyoRNNmgpwqJCyQ9ILLRQUno2HnH7oRZbKXFuRHYwjpHRUCNtLu3SbCKBLO9Rn0buNu+VTPe
FGUQ17wmLrMQsoN7rIBfjmokPdQiJE0xBYgJQh0iKBRFakJCEMRaRhMFMqqjX86QdncW3Se4aM14
Wtnpl/RNmLlDAZcUV6yfvsM9RiiUJXoqkTjzQuDVIwJjYuQ1nv8E0NxcigeV8QCmf/MUH6yvlnLg
poN4VG+SF9wsCDwXiB6cfc0hPEJHhuUCRasYpDEjn+tUhzLdIMjCMxjckZ1LWqabjLRXbOZTlhUm
sGCCQ11HGcG4MkSlSBJEKqRsJj9UpabioyZkmVW0V4WxWt5rBVRGYPK8lGn/qRoCsetC0khyF2Q4
bLY6ilJfMwbrWJeV4ZMBxQ/AsgD2U0mi+AuQTkkl1YkucFVGJjtgVJ97MRWeq9TmqcPb8GstzXaB
MqjndIkOmhmM8TXAweoQou+95Zq8e7f1imqmuGhLELzpUIrp1ZaAhzDPGUYjEouPEWTWXLSOS9UY
10jyBIMRCgCVlGmyB8s3B5DcN6SrQsAcMHAqFY/oK3rOYOWZnhMifexeLjaKy8IjtsP8XckU4UJA
CL+NCA==


--===============1180690650==--