bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3265)

[Andrei Elkin]

 3265 Andrei Elkin	2010-12-23 [merge]
      merging from the repo wl5569

    modified:
      mysql-test/suite/rpl/t/rpl_row_until.test
      mysql-test/suite/rpl/t/rpl_stm_until.test
      sql/rpl_slave.cc
=== 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 ")));
   }
 };
 


Attachment: [text/bzr-bundle] bzr/[e-mail]