From: Andrei Elkin
Date: November 2 2010 3:15pm
Subject: bzr commit into mysql-next-mr branch (andrei.elkin:3191) Bug#57893
List-Archive: http://lists.mysql.com/commits/122562
X-Bug: 57893
Message-Id: <201011021515.oA2FFtGn020599@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0112123987=="

--===============0112123987==
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

 3191 Andrei Elkin	2010-11-02
      Bug #57893  rpl_row_ignorable_event fails when --binlog-checksum=CRC32
      
      There were two issues with the failure:
      
      1. The reported explicitly  CRC32 `val' in the header needs filtering out via
         --replace_regex
      
      2. More serious is that at verbose mode of event decoding the checksum trailing part
         of Rows-log-event:s was not cut off so the decoder decides there is more data.
      
      Fixed with deploying --r--replace_regex in the test and correcting the actual event size
      inside the verbose decoder of Log_event::print_base64().
      
         
     @ sql/log_event.cc
        correcting the actual event size of Rows-events in case of checksum is present.

    modified:
      sql/log_event.cc
=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2010-10-25 19:02:24 +0000
+++ b/sql/log_event.cc	2010-11-02 15:15:44 +0000
@@ -2338,6 +2338,9 @@ void Log_event::print_base64(IO_CACHE* f
   if (print_event_info->verbose)
   {
     Rows_log_event *ev= NULL;
+    if (checksum_alg != BINLOG_CHECKSUM_ALG_UNDEF &&
+        checksum_alg != BINLOG_CHECKSUM_ALG_OFF)
+      size-= BINLOG_CHECKSUM_LEN; // checksum is displayed through the header
     
     if (ptr[4] == TABLE_MAP_EVENT)
     {


--===============0112123987==
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: 5eae69e490961a77d31f98e0f247c90c191576c5
# timestamp: 2010-11-02 17:15:55 +0200
# source_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/5.6.99-\
#   next-rm-wl2540-checksum/
# base_revision_id: andrei.elkin@stripped\
#   y9mxpvdawexslf4y
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSG/hdsAAd/fgFQQeeP//3/v
ngD////wUAUMXgDTIAAaA0mino0k2k2o/UzU2o1BoBvSQZNqepoAAaHGTJpphMjIGBGJowRhBo0w
ACDUyaamSeqfqanoj1PIho0NGgAAGjQ9QNBxkyaaYTIyBgRiaMEYQaNMAAgkkEaaExMImTEGkxMk
TYmk9T1H6pp6maZNCtSBLi/T3XVfCPbueH4nunsb9IGQMXEoEKjNiWqUlpAGGFoIJmZx5o2ouTFf
kREFzilIEylMCNSU2VkXygQLDfEQ/Iqerj1yB5/uM1oeswW2tocmXc+XEmNp2XTJsiEcKKauaFNR
dNA5WPoFIV0otE4QyQrgqwCquxtjDJgXwIo4TFVcElRIUwIR4K5xNtNatTiTnJlEhY3XQV+YuPkr
7Oe+UEW4COkR27TO+NHCooQzVt4q9fuYl5emQUgG9ktjQTJ3V42EHg4JygozkDhn2I8ecEKC8mE4
LsC/SCD3snwsfJtfRnroKrIp38T1i0Fxd5SXGPJeECtp4suF4t5t2TEeWgsW3KzXpDPQwptIqWnD
PSAVwL9yafAjFmlNS+Ax1iowXHunRDU+fUNd0cjEWXPc+VdyVsCkrem6nvhuiLPdCJsuNtTrPrTe
vuWZDlWKmUcf5g+Iqt/O9bNPg2SxmD5F1Iv571ZRUNUajDOFWzLVRRfQtfDGg64alP1W99ztpvWM
MVrvwpcoRLWTK55VJxr1Uvr4Tvrt9YtVVii0ugsi4NGoB9T2vNiaEonZVa07gE6IVF5SebQ0OBsS
ps0DQQmnAhOXvqZB3DHGiXBsex7OPm6KR9jOksYYtXpD6FCevfHCX/l+v7Rp+H0tZRPauxMrfmWq
f2TVu/dUVKRQfRNZ9VR9T6pmNpwz+Im3Pd2IBQthcEvWfTcAy1sHFmXlhs75R4GCF8RyFnZgCyFo
tGykNnwxXpCgKwg/yyYFTZbVkum+IzJ2aMJfjGoIw0i8Ese+/Mx6BV+oGtRU36GrgRsycekmTN8d
Ryr48qlr+3z7Y1M4ThDKtIykzyA+p4d95lzmr2+QmkuFCc9Z17VbovAZfqvSVKKHszP7B8JpGuMH
evmuTYtgw98GthBnOc0IgvTiLL9n8fZXRtHsTn3+d3QNqUgrKi5XsJlWVR1XTOnPN9FdLfOaFR+F
Pc27+HO7BGHIKuhyTmBkYsyNuUCjzamDcae/lPpKW2ethheBEOkhatJKVXWjlwWnJTPI8qCmRj7P
HwaomuN48huTRNkRVmTC4CwNlF1/dUtCfN2jukHgfdjWYRFuhGwW1P0WDmEMNnvNL5rLpC/U+f24
lHaLYjoGagz5smSWufqwwpLPKmPn1boYhG0NAqdmZ9vpILiBBwLQHiyXmG4KpBS9dHMMOBMQ2bEl
NVlMHc/lWkZ8+XT7mXurr6k2LcfwU14CGZjisNCk3Tp8OBTSS2K8PaoffS1FZ7GckNXWPD0cIfCc
QK053nFrXzQmYGYGV3VJ2ByVNQtEvlAFUF9Bv1iNoT/zYqjcRXWb1VnXbe7/5h53YhRuZkzPKu2r
YU2uL+MpzKF+SC/JTClVfnWHDhF6vSWmjx7Mxfgd54pE0TMbce55OTRata/xuooyN8wiUCAslChq
kFlWeIc4Y+oJcEAb43jEqdIBw0JWr9y2rBU+Hg1ldv+B9xDBOHhr/ITnLfk5qMjYw9zsGF0iYgw8
dQ6nLXrTail4L3OsptO0prCxVMUMoRIarDSXxr63pXPqbx/rYLqWxIvTXHcmcEBSeZJrExK+JSd2
PitShxTJYaJlNfiamrpHzQ+Vy/sXckU4UJAhv4Xb


--===============0112123987==--