From: Andrei Elkin
Date: March 29 2011 1:56pm
Subject: bzr commit into mysql-trunk branch (andrei.elkin:3343)
List-Archive: http://lists.mysql.com/commits/134170
Message-Id: <201103291356.p2TDud4I029468@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1790370553=="

--===============1790370553==
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/MERGE/mysql-trunk/ based on revid:andrei.elkin@stripped

 3343 Andrei Elkin	2011-03-29 [merge]
      merge from local bugfixing branch to local mysql-trunk prior to push

    modified:
      client/mysqlbinlog.cc
=== modified file 'client/mysqlbinlog.cc'
--- a/client/mysqlbinlog.cc	2011-03-25 15:20:25 +0000
+++ b/client/mysqlbinlog.cc	2011-03-29 13:56:27 +0000
@@ -1681,8 +1681,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))
     {
       /*
         If this is a Rotate event, maybe it's the end of the requested binlog;
@@ -1771,6 +1770,14 @@ static Exit_status dump_remote_log_entri
           ev= 0;
         }
       }
+      
+      if (type == LOAD_EVENT)
+      {
+        DBUG_ASSERT(raw_mode);
+        warning("Attempting to load a remote pre-4.0 binary log that contains "
+                "LOAD DATA INFILE statements. The file will not be copied from "
+                "the remote server. ");
+      }
 
       if (raw_mode)
       {


--===============1790370553==
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/MERGE/mysql-\
#   trunk/
# testament_sha1: 21e5b61c8eca97053090d77a81706fd8103bf06d
# timestamp: 2011-03-29 16:56:39 +0300
# source_branch: file:///home/andrei/MySQL/BZR/2a-23May/FIXES\
#   /bug11765758-rpl_corruption/
# base_revision_id: andrei.elkin@stripped\
#   7fkbfwjtpvxnc5hy
# 
# Begin bundle
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


--===============1790370553==--