From: Jon Olav Hauglid
Date: April 12 2011 11:01am
Subject: bzr push into mysql-trunk branch (jon.hauglid:3352 to 3353)
List-Archive: http://lists.mysql.com/commits/135256
Message-Id: <201104121101.p3CB17Qu010733@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3353 Jon Olav Hauglid	2011-04-12 [merge]
      Merge from mysql-5.5 to mysql-trunk
      Text conflict in mysql-test/r/xa.result
      Text conflict in mysql-test/t/xa.test

    modified:
      mysql-test/r/xa.result
      mysql-test/t/xa.test
 3352 Sergey Glukhov	2011-04-12 [merge]
      5.5 -> trunk merge

=== modified file 'mysql-test/r/xa.result'
--- a/mysql-test/r/xa.result	2011-03-25 15:13:41 +0000
+++ b/mysql-test/r/xa.result	2011-04-12 10:59:59 +0000
@@ -193,6 +193,8 @@ SAVEPOINT savep;
 ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the  PREPARED state
 SET @a=(SELECT * FROM t1);
 ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the  PREPARED state
+UPDATE t1 SET a=1 WHERE a=2;
+ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the  PREPARED state
 XA COMMIT 'a';
 SELECT * FROM t1;
 a

=== modified file 'mysql-test/t/xa.test'
--- a/mysql-test/t/xa.test	2011-03-25 15:13:41 +0000
+++ b/mysql-test/t/xa.test	2011-04-12 10:59:59 +0000
@@ -318,6 +318,8 @@ INSERT INTO t1 VALUES (2); # used to cau
 SAVEPOINT savep;
 --error ER_XAER_RMFAIL
 SET @a=(SELECT * FROM t1); # used to cause InnoDB assert
+--error ER_XAER_RMFAIL
+UPDATE t1 SET a=1 WHERE a=2;
 
 XA COMMIT 'a';
 SELECT * FROM t1;

No bundle (reason: useless for push emails).