From: Marc Alff
Date: May 13 2011 4:15pm
Subject: bzr commit into mysql-trunk branch (marc.alff:3084)
List-Archive: http://lists.mysql.com/commits/137353
Message-Id: <201105131615.p4DGFffk004671@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///Users/malff/BZR_TREE/mysql-trunk-bug11766111/ based on revid:marc.alff@stripped

 3084 Marc Alff	2011-05-13 [merge]
      Local merge

    modified:
      mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
      mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test
=== modified file 'mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result'
--- a/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result	2011-05-12 17:29:19 +0000
+++ b/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result	2011-05-13 13:35:12 +0000
@@ -350,8 +350,8 @@ BEGIN
 UPDATE t2 SET c1=3;
 RETURN 2;
 END |
-CREATE TABLE t4 (c1 INT);
-INSERT INTO t4 VAlUES(1),(2);
+CREATE TABLE t4 (c1 INT) |
+INSERT INTO t4 VAlUES(1),(2) |
 CREATE FUNCTION f_multi_update()
 RETURNS INT
 BEGIN

=== modified file 'mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test'
--- a/mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test	2011-05-12 17:29:19 +0000
+++ b/mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test	2011-05-13 13:35:12 +0000
@@ -273,8 +273,8 @@ BEGIN
   RETURN 2;
 END |
 
-CREATE TABLE t4 (c1 INT);
-INSERT INTO t4 VAlUES(1),(2);
+CREATE TABLE t4 (c1 INT) |
+INSERT INTO t4 VAlUES(1),(2) |
 CREATE FUNCTION f_multi_update()
 RETURNS INT
 BEGIN

No bundle (reason: revision is a merge).