bzr push into mysql-trunk branch (Dmitry.Shulga:3675 to 3676) Bug#13070308

[Dmitry Shulga]

 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
 3675 Inaam Rana	2011-12-21 [merge]
      merge from 5.5

    modified:
      storage/innobase/include/ut0rnd.ic
=== modified file 'mysql-test/t/xa.test'
--- a/mysql-test/t/xa.test	2011-05-31 13:52:09 +0000
+++ b/mysql-test/t/xa.test	2011-12-22 09:27:58 +0000
@@ -343,8 +343,8 @@ DROP TABLE t1;
 DROP TABLE IF EXISTS t1, t2;
 --enable_warnings
 
-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);

No bundle (reason: useless for push emails).