From: Andrei Elkin
Date: December 23 2010 3:49pm
Subject: bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3264) WL#5569
List-Archive: http://lists.mysql.com/commits/127563
Message-Id: <201012231549.oBNFnQAv017569@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0436271543=="

--===============0436271543==
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-wl5569/ based on revid:andrei.elkin@stripped

 3264 Andrei Elkin	2010-12-23
      wl#5569 MTS
      
      fixing corner cases that mtr-testing with mts workers against stardard suites reveal.
     @ sql/log_event.cc
        removing COMMIT Query event from a set of ones containing the partition info.
     @ sql/log_event.h
        ROLLBACK TO can be inside of a replicated trans.

    modified:
      sql/log_event.cc
      sql/log_event.h
=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2010-12-22 18:31:13 +0000
+++ b/sql/log_event.cc	2010-12-23 15:49:19 +0000
@@ -2369,7 +2369,7 @@ bool Log_event::contains_partition_info(
     // todo: Query event is limitly supported
     // which ev->get_db() yields the session db not the actual db
       
-    get_type_code() == QUERY_EVENT;
+    (get_type_code() == QUERY_EVENT && !ends_group());
 }
 
 /**

=== modified file 'sql/log_event.h'
--- a/sql/log_event.h	2010-12-22 18:31:13 +0000
+++ b/sql/log_event.h	2010-12-23 15:49:19 +0000
@@ -1931,7 +1931,8 @@ public:        /* !!! Public in this pat
   {  
     return
       !strncmp(query, "COMMIT", q_len) ||
-      !strncasecmp(query, STRING_WITH_LEN("ROLLBACK"));
+      (!strncasecmp(query, STRING_WITH_LEN("ROLLBACK"))
+       && strncasecmp(query, STRING_WITH_LEN("ROLLBACK TO ")));
   }
 };
 


--===============0436271543==
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-wl5569/
# testament_sha1: b34bdb8be220cc4a6f882c85f8db984d33f9a20b
# timestamp: 2010-12-23 17:49:26 +0200
# base_revision_id: andrei.elkin@stripped\
#   m72bh3bbd1330uh0
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbRtdPcAAlzfgFgQeWf//3rv
v6C////wUAVB7SmsdupHZl7ve3XXQlCCmJoDSbETaQ00TTaj1NpB6g9T1Bp4kASSKemQ1TegmKCe
hMj1HqBoAAAAAMmqnp6SeqbFNNMQZAyAaAAYgAGgGVJ6jTNQ009RoAANABoAAAAAkkRiTNRpMCm2
lPNKbU0yMgaGmINNA0NH7VKaLOcX8bfvtNlZklx1jTPnILhRCOUaCtz2M5sCAyV+zxkyFBfFVVU/
G84vipdeMUaMMVe+SjfJ2d17rNhvzcbfNxdP/dB+mp/MsHeWUc65beP653I0c0zwhccrZ9VlmfEt
/IZrxZ01z86ELgyBwoId/fuKuPqix17J8o5lOg5kxpShWm9X7MV4pp9K5COB4Fd5uL+aOyOBExLa
JORmXTgSNpTniI3s4WB0p2+gmQqgQ5DCxIPgfkqxjVsKAVVLTAzmBqIqZWy1QSDoYVpizSK2fRSh
QarFvyTJKyJHApB0rZZQA+3M07OfKXa6jIBko+UTFDDK85ANHC2Flg5WIXdoE0JkiAQLHRzqFrIp
gp6FsTzlAuMjSKMpWKlaSeJIeOirhnD8DjaxoioDM+vHWWFRwrCPMxMlgXCyXjJlN+BQTgRskNYy
RypLyOSWDpvMDEpbAb4aK8zIYNK14Aq05i4WEpFkhRlNFKrA3raSjcQqqJG/KVwk19QSechEvv4l
SBVb1o4FbuAT3jNqsHnIxuXXL6Ywjj0psSvTJ4VwJYZKIEMVmYPNg+67daXZDqZWXtaxcWE3CeAz
zMg4DgdSqtkxpcKMdUBWSbGqdKEntjPFoVT0l41wbCg1AodowgaxmCAgFM6rGLO6SISZuMyXrnu4
Js15oeMEdnSXQEtK2ysGZk3avnuS3B5w4ecNh8jicOR5JMkhuSCy3TiLMTJLAcY8Kxc8nJOO0r/c
Zlnf3neZu4R1uNW0ck/qejwLRkeUoF29rGrVGJ9dwieBcWHge0uXktIXsEu3CP8Y9KGo6kUbzf79
clAEqa6lZw2ukeU1FJQPGSlKWMqbz4piweAiyhZrGylH9A2E9Q13tIHUhl8PnNxKNbMJfVZzcByV
iWTCdasW1SvbGWGffcrVmGgAxwBLskD6EYM67ByctSo+UjVix8SrAIxnItr3s9AbuF7mgD52jt5u
IQNGdSwIot56jhMK2rmUNNNVl66DPHhSWj42svJrBEj+6GUQUVFQklqw0XKdCWoQy5Ac6vAk+fpE
GQltISZisS/nO0xmlaxbDOdWnC7s0skhcJqUrO4taBjSO3rCaFQU7FJPfQGcRP7AMB3Wl3KRV3EG
m9PPMn7hOHmGHiWYLqRhJh6dfoaz/Lz2pTdVuXAgYp0ghdaOT/T2qorVm5po3UJkKsD9N+Ji6EQy
GYiUwJMohN4qWEwBEIhdB7qpiqWgSsCyUJzMAlyQ9PLznJ0i1Zqm1ZgEUxktZerzOsq6S+ZKSrMl
aG0QsB5GcAOEIAlnE4eBHogTJ5mi5MiliEwi8iJRZOYGU1hLI2Foi046GpQmYkLmi+k8BLmRtmoZ
6laqS18TLYBPNhgZh6+8dpNYmyZrnWJtnIXQyUgqLZDBSHROADU1xdBUSA0/gBJtEltCWQ7ruVfY
sDAsHbx1sLuaROTmYY43KVnGqP2KEi5qkbVIlrEIVwJaJunAMDSSUhUhSbJoVLQIXMysroMItHU/
lYReoOHhB0DqWqFWzXaF74DzqHUzoTi9yJrLU8e+hwYlDPaBtNHx3HQrNdrrikCwFNVqp6Kldfk6
7coFqrJCwFmtOVZ8yXC01KC/4u5IpwoSFo2unuA=


--===============0436271543==--