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

--===============1843248209==
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/tmp/mysql-next-mr-wl2540/ based on revid:aelkin@stripped

 3175 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 goto err and a text for a new warning on the master

    modified:
      libmysqld/CMakeLists.txt
=== modified file 'libmysqld/CMakeLists.txt'
--- a/libmysqld/CMakeLists.txt	2010-10-01 12:54:59 +0000
+++ b/libmysqld/CMakeLists.txt	2010-10-27 14:44:18 +0000
@@ -54,6 +54,8 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc l
            ../sql/log_event.cc ../sql/mf_iocache.cc ../sql/my_decimal.cc 
            ../sql/net_serv.cc ../sql/opt_range.cc ../sql/opt_sum.cc 
            ../sql/parse_file.cc ../sql/procedure.cc ../sql/protocol.cc 
+           ../sql/records.cc ../sql/rpl_filter.cc
+           ../sql/rpl_record.cc ../sql/sha2.cc ../sql/des_key_file.cc
            ../sql/rpl_injector.cc ../sql/set_var.cc ../sql/spatial.cc 
            ../sql/sp_cache.cc ../sql/sp.cc ../sql/sp_head.cc 
            ../sql/sp_pcontext.cc ../sql/sp_rcontext.cc ../sql/sql_acl.cc 
@@ -83,7 +85,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc l
            ../sql/sql_alter.cc ../sql/sql_partition_admin.cc
            ../sql/event_parse_data.cc
            ../sql/sql_signal.cc ../sql/rpl_handler.cc
-	       ../sql/rpl_utility.cc  ../sql/rpl_reporting.cc ../sql/binlog.cc
+	       ../sql/rpl_utility.cc ../sql/rpl_reporting.cc ../sql/binlog.cc
            ../sql/sys_vars.cc
            ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc
            ../sql/mdl.cc ../sql/transaction.cc ../sql/sql_bootstrap.cc


--===============1843248209==
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/tmp/mysql-\
#   next-mr-wl2540/
# testament_sha1: 6e05bdd015b8accbfd694e8b2cbe8d283d95229f
# timestamp: 2010-10-27 17:44:58 +0300
# base_revision_id: aelkin@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTZ+2EIAAaXfgAiwWGP/93pH
j4C////wUAQdJ4HnBqN1jUJRCamTU9NFPwmmJG1GptTanlN6mjRoPVPUeoOYACZMACYTBMIYAjAA
lJPSaeoaTT1T1NqBtR6nqAAAAAASSajKYmjU9T1GaRoAaGQAAAAlEmI0ABNNMo9CmyJk0yZAANNJ
lNXdfqZvO3pbyzZHjQUWzVIL2wDQTQrQWOdtFKLWqVVTlxTBz2ytFkc1VYx8CyX7PqheJ7X6P44y
/HSJqun5bM8jsSi5ntIGxyTxw4U259yMVDSV6AhNQh5/J1ZYGLhZe7Uiyais0MzaG0gXSz5qG2Pr
DZYEkuFKdYbZTxAwVgRSyswOVwCAhhYgZLlNpM5fNcTKLrEnqxvLQJhJBusgieCiXVl7IgfE2YHu
ZndV5nFPESuWXZQJCvcpjSTTRTWzWxEh4BqYZMJlaCc4uZRfSF9YPMRNp+m003waHqeyx9QnoZlA
0vtBr5ZlI3Dnz7t1pkp6kkBsqTxkgmxRGiUjBwMKDDYDyQdGVXXBGI6BxE4MQmTEryK/Le4lvrC5
LcLuIitjYzJm+oimco4sIx9UePCrZelgrygmE45sFHjRbyEKUnXczqV2Ik1qvoFJ4y17b7nzwujX
IIz568ykKRRgfqVsPJNZTHCSRe4GjJnuaqYYmR0HPGCFDo9RhDMWzJV6bXIhh89sMaop5Ni5wZLx
mH07bhz5uSHnlV3l2zVZPBQcM3uGxjUK7TEbzSwu8dt+xEgtCVocbjWcJ53zTay4Xq/e/fmQ5LKi
rX41e9nQSSfJIBtQ3aezhT5gcL3Hrnt0yxOZcxE3GONEM2J5YawZxjYMszXUa/RKD7Y0qenEa5ND
30V3GLPOwDJji6/v/pjvFQPXlVqGlM9fe95qZ+ZZQ2mhQXF8HSvdUCgPsnrXl/GFRmHFEpqmMEUG
0UMOystgsrrIgniVUldSU09fdXAbCwrlPDp3UMVlwWxJzOzsaYrqh1BWEnttO8TIGdKDsylva7rC
0OSBGa0rX2bEV3A1E0CJVK7ACeHa6700wjuCbmH3uOStcxdp1FJomzIIwRgRD/E0QTMNJg4iQaHW
D4aYFKI4tDBhY+qohoy04lFsHk+SIRMWSvaqNiiaY1xY4fobuAliZUiZ0hqqRwbvZKueeqINKGkX
Q2tWhByOS/LGpr8wJYMFkB9MkSoFFS4VL5Yc/RqGV6V5KqYsaQrDuExqzhyI8TeSiU0iI6fN04RN
RDoU4eLugCRBtO+4e3MgmokmbsJwkNVkNFSmRO8O4R8V7LEzonsoCLpgk7oeUi9KDAFixW4oCdNG
RZrtZoJmu/skZ5yLwhZnte1OxGnHuVkHkFQMngsfWl8ijz6pDKiCYBduEjh2lT7esWP3ilu8tnOC
ENqKD4s7O5l4hMW6ApM5KR/i7kinChIGz9sIQA==


--===============1843248209==--