From: Dmitry Shulga
Date: December 22 2011 10:40am
Subject: bzr push into mysql-trunk branch (Dmitry.Shulga:3676 to 3677) Bug#13070308
List-Archive: http://lists.mysql.com/commits/142232
X-Bug: 13070308
Message-Id: <201112220940.pBM9ekZL003466@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3677 Dmitry Shulga	2011-12-22
      Follow-up for patch for bug#13070308.
      
      Fixed changes in the result file for xa.test.

    modified:
      mysql-test/r/xa.result
 3676 Dmitry Shulga	2011-12-22
      Prerequisite patch for bug#13070308 - (VALGRIND FAILURE IN XA TEST).
      
      This patch sets explicitly the type of engine for tables used in
      the test as InnoDb since there is a suspicion that the test failed since
      table's storage engine has type MyISAM. For MyISAM tables we observe
      exactly the same test failure as described in the bug report.

    modified:
      mysql-test/t/xa.test
=== modified file 'mysql-test/r/xa.result'
--- a/mysql-test/r/xa.result	2011-04-14 08:47:14 +0000
+++ b/mysql-test/r/xa.result	2011-12-22 10:38:23 +0000
@@ -206,8 +206,8 @@ DROP TABLE t1;
 #                FAILED 
 #
 DROP TABLE IF EXISTS t1, t2;
-CREATE TABLE t1 (a INT);
-CREATE TABLE t2 (a INT);
+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
+CREATE TABLE t2 (a INT) ENGINE=InnoDB;
 START TRANSACTION;
 INSERT INTO t1 VALUES (1);
 # Connection con2

No bundle (reason: useless for push emails).