From: Hemant Kumar
Date: September 18 2012 5:27am
Subject: bzr push into mysql-trunk branch (hemant.hk.kumar:4496 to 4497)
List-Archive: http://lists.mysql.com/commits/144776
Message-Id: <20120918052726.BFDAE6415CD@hemant-ThinkPad-T410>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4497 Hemant Kumar	2012-09-18
      Non-functional change.
      Resolved the conflict in t/partition_alter2_2_1_innodb.test

    modified:
      mysql-test/suite/parts/t/partition_alter2_2_1_innodb.test
 4496 Rohit Kalhans	2012-09-18 [merge]
      Null upmerge for backported patch for bug#11758505

=== modified file 'mysql-test/suite/parts/t/partition_alter2_2_1_innodb.test'
--- a/mysql-test/suite/parts/t/partition_alter2_2_1_innodb.test	2012-09-17 04:52:47 +0000
+++ b/mysql-test/suite/parts/t/partition_alter2_2_1_innodb.test	2012-09-18 05:26:54 +0000
@@ -1,12 +1,7 @@
-<<<<<<< TREE
-#Want to skip this test from daily Valgrind execution.
---source include/no_valgrind_without_big.inc
 #Considering the time taken for this test on slow solaris platforms making it a big test
 --source include/big_test.inc
-=======
 # Skiping this test from Valgrind execution as per Bug-14627884
 --source include/not_valgrind.inc
->>>>>>> MERGE-SOURCE
 ################################################################################
 # t/partition_alter2_2_1_innodb.test                                           #
 #                                                                              #

No bundle (reason: useless for push emails).