From: Andrei Elkin
Date: October 27 2010 3:06pm
Subject: bzr push into mysql-next-mr branch (andrei.elkin:3187)
List-Archive: http://lists.mysql.com/commits/122125
Message-Id: <201010271506.o9RF6bfe005585@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0509300788=="

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

 3187 Andrei Elkin	2010-10-27 [merge]
      merge wl2540 repo to a local tree

    added:
      mysql-test/suite/rpl/extension/README.checksum
      mysql-test/suite/rpl/extension/checksum.pl
    modified:
      mysql-test/collections/mysql-next-mr.push
=== 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] &


--===============0509300788==
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: ddc393c3d2effcfb62ec628a1c945a29e7547bec
# timestamp: 2010-10-27 18:06:37 +0300
# source_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/5.6.99-\
#   next-rm-wl2540-checksum/
# base_revision_id: serge.kozlov@stripped\
#   vzvaxl7l9m8o1o6x
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQi+cWsAAsf/gEGQAGBYZ///
ckePgP////BQBc1vBVSSwigOnTRwlFNBMmkek9BPRtEjE0wJpptQMg9TQBKQIYBJo1NoU9QAAYAm
gAaAkk01KepkzSZMCNABpkDQDQ0AA5piZMmjCYJiaYBMAhgjAjAJIiGgmE0AEzRE9TSeoybU00A9
TTRtTdAk1BOLxvl7acJ2TuPWJ5QfSd6+9KNUQdWJRjbL1Dw9a2gTpWvdm8Iq7q7JmNPkvh50KqzQ
a84aJVMWmaIiAXpq1W6zISDTiXRd8H2sY6PkHx+kLPeM64ixgZWU+C9z0YbWIxKxINJF7nMCSyNs
YEPCGfDjpY3q8pzpDV5EBe77nd7NQ3XYVGRaOCHDT1PniG81EUDExzOUGN/JcinZTBbwrTJLckDL
GFUHfd2mAw4HhBy3WTiRAEcfe9DAKmYLo+kykMUhgPMVOkZw6Baisih2o+O9yBE+p8b86tYUO4kJ
FWcHBDKwtkg1nAN10CUCI9I18X2nz0IYzIPqUjgx+tTC/k0Xws0xerEJ13Vw1XaJSOYiG0PWbxtM
wZ5godlqU45AJwRuH12Gi5OKsoqCNAUxBx8YGg1HQoDQwzVcGhGtRco3MU6v6kmRZ9DvFBVejU5t
jFIhwuwCA6ncLc7UBiqqDCkn445pmUnobECbrI7fTvei6CX7UTgXmy5O2Upt1iEDXagRZIHIDsV5
X4DcCxoRvg8umbkCs9dbTwePYUyJBRGMoK5vJBDiscGLilBmIAiRjM6coiPZsqKIy1CaYuKEYDYQ
WSC6yu4gQzli1C3h6gYDYYqip4qhUbU2ZQUL9KYhdas0OQGksSZRqzb5HNeWDOJMMbmuRuq4XusZ
MqgPMxg0cKvMZjEcC0MUFSedOKiQxV5lx5rsae2ozQc6fq20nSDgvp6aCEjVVBSpnL1kKivmGa6+
XJ1IOUiu9BJfUTGhwqdCbQRi66XxGZijKZs+Uec1Nq7EQJbOeUdEk3wheujxcltBmKRXAUcc+iym
u2BuRfI0oRCjFHxqaU720UYZ6NjXGDKMVNzFJ3O7ZicmDYiQI/HaFCEk5h3wiTGQbl8pjq53k9Cx
cqTpBISMCZRnTG3D2EMKjRqGwpDGlEoEDPNIJqOtpfzVV7IRIxNFXdyMl+jpAyb1u5xHIZ9+ruD2
9/S0a9mzWCt67R1l7TDnTW8XbkTYuHpK8ghMZWwjkThiZWMDIiBImQiRogoFtDDgdbpw5rIkZGW0
oCcK0tFTDBEu3rufcuTbIrjar6zx8Lht0YB3nqgYyQdptQy0hcBdsKv9vOWw2inFPBFsU54+YT4o
2kzIQytXYa8oPsDExzWCKyAW+xIVlPBis+m8zk5SYJWVmSWYyIzZ8EHUNKnihGgXeoqBu/pbALFy
CxKcia0wvJdFInW/jYkDExZ+xSkETWZEwa12VxGgY6Aj70xpVHJFPFWBsN8jp2CgoUuI5SqFaytT
KCQMWSIGmJuwZIIIpJEIkaqg4Cgn0RGGsqRhMyBhXdEtmkPcvJaYVrg5wAV9YzJbiBOms+yQZhYE
EWwFij3mmczLwvDxTGnDcMyNjxVJlnWxX75+JgQH8TVNB7YxOERaJsQGjkBOUoOz3oIPAuVxkOpw
pGwtIIvkucSudz4ebUrkxVoQMKRE9ZiYimHMxcEDYOrIySehYMNGspaXoevw8UE4UmCRsJWRVzGt
9PNZcFy6EsQxMeB3GIHmTHFiNUsjUOl+MiVxYECZRGJCrE7InZEiy+c+XIdLvOY3wPcGZeKuzC1g
4yXgXoOKoj+SDHmVA65jUGtSDVYqkqzqwaEHsM6CfQEilUky8A/xdyRThQkAi+cWsA==


--===============0509300788==--