From: Andrei Elkin
Date: March 28 2011 3:44pm
Subject: bzr commit into mysql-trunk branch (andrei.elkin:3327) Bug#11763265
List-Archive: http://lists.mysql.com/commits/134087
X-Bug: 11763265
Message-Id: <201103281544.p2SFix3e018644@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1496575444=="

--===============1496575444==
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/FIXES/bug11763265-55956-mysqlbinlog_raw_mode/ based on revid:georgi.kodinov@stripped

 3327 Andrei Elkin	2011-03-28
      bug#11763265 Potential bug with new --raw mode with mysqlbinlog
      
      There are two reported artifacts on possible operations with uninitialazed Log_event* pointer
      inside dump_remote_log_entries().
      In fact, under --raw mode only Load-data events generated by pre 5.0.3 servers is the valid issue.
      That relates to the assignment Load_log_event *le= (Load_log_event*)ev
      where rhs is not initialized when --raw.
      Rotate event is indeed handled correctly.
      
      Fixed with enforcing all events incl LOAD_EVENT, CREATE_FILE_EVENT to be dumped as raw_mode
      is supposed to do without instantiation of the event.
      In case of CREATE_FILE_EVENT another artifact is corrected to pass such event to re-formatting
      to yield an event of the latest binlog-format.
      Notice, in --raw mode mysqlbinlog does not copy the data file of LOAD DATA query that is does
      with just -R option, and that fact is warned.
     @ client/mysqlbinlog.cc
        In case not raw_mode LOAD_EVENT and CREATE_FILE_EVENT require conversion into the current load-data formats. In case of raw_mode all events including the two does not need any extra treatment.

    modified:
      client/mysqlbinlog.cc
=== modified file 'client/mysqlbinlog.cc'
--- a/client/mysqlbinlog.cc	2011-01-18 12:09:03 +0000
+++ b/client/mysqlbinlog.cc	2011-03-28 15:44:54 +0000
@@ -1673,8 +1673,7 @@ static Exit_status dump_remote_log_entri
       */
       ev->register_temp_buf((char *) net->read_pos + 1);
     }
-    if (glob_description_event->binlog_version >= 3 ||
-        (type != LOAD_EVENT && type != CREATE_FILE_EVENT))
+    if (raw_mode || (type != LOAD_EVENT && type != CREATE_FILE_EVENT))
     {
       /*
         If this is a Rotate event, maybe it's the end of the requested binlog;
@@ -1763,6 +1762,14 @@ static Exit_status dump_remote_log_entri
           ev= 0;
         }
       }
+      
+      if (type == LOAD_EVENT || type == CREATE_FILE_EVENT)
+      {
+        DBUG_ASSERT(raw_mode);
+        warning("A remote pre-5.0 binary log that containig LOAD DATA INFILE "
+                "statements is dumped. The loaded file will not be copied from "
+                "the remote server.");
+      }
 
       if (raw_mode)
       {


--===============1496575444==
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/FIXES\
#   /bug11763265-55956-mysqlbinlog_raw_mode/
# testament_sha1: ac51425625cf3a6914da6126a531b39aab8c4068
# timestamp: 2011-03-28 18:44:59 +0300
# base_revision_id: georgi.kodinov@stripped\
#   lw2g411ffimrgmtt
# 
# Begin bundle
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
7NvEoH/4u5IpwoSDx9vvaA==


--===============1496575444==--