From: Sneha Modi
Date: November 19 2012 9:21am
Subject: bzr push into mysql-trunk branch (sneha.modi:5027 to 5028)
List-Archive: http://lists.mysql.com/commits/145324
Message-Id: <201211190921.qAJ9LZcd020589@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 5028 Sneha Modi	2012-11-19 [merge]
      Merging from mysql-5.6 to mysql-trunk

    modified:
      mysql-test/suite/innodb/t/innodb-wl5522-debug.test
      mysql-test/suite/innodb/t/innodb-wl5522.test
 5027 horst.hunger@stripped	2012-11-19 [merge]
      Merge from 5.6.

    modified:
      mysql-test/suite/parts/inc/partition_crash.inc
=== modified file 'mysql-test/suite/innodb/t/innodb-wl5522-debug.test'
--- a/mysql-test/suite/innodb/t/innodb-wl5522-debug.test	2012-10-04 05:45:52 +0000
+++ b/mysql-test/suite/innodb/t/innodb-wl5522-debug.test	2012-11-19 09:20:25 +0000
@@ -1,6 +1,9 @@
 # Not supported in embedded
 --source include/not_embedded.inc
 
+# Adding big test option for this test.
+--source include/big_test.inc
+
 # This test case needs to crash the server. Needs a debug server.
 --source include/have_debug.inc
 

=== modified file 'mysql-test/suite/innodb/t/innodb-wl5522.test'
--- a/mysql-test/suite/innodb/t/innodb-wl5522.test	2012-10-17 13:27:14 +0000
+++ b/mysql-test/suite/innodb/t/innodb-wl5522.test	2012-11-19 09:20:25 +0000
@@ -1,7 +1,5 @@
 # Not supported in embedded
 --source include/not_embedded.inc
-# Adding big test option for this test.
---source include/big_test.inc
 
 -- source include/have_innodb.inc
 

No bundle (reason: useless for push emails).