bzr push into mysql-trunk branch (mattias.jonsson:4010 to 4011) Bug#13783690

[Mattias Jonsson]

 4011 Mattias Jonsson	2012-06-14
      bug#13783690
      
      Requiring --big-test for some of the long running tests in the parts test suite.

    modified:
      mysql-test/suite/parts/t/partition_alter1_1_innodb.test
      mysql-test/suite/parts/t/partition_basic_innodb.test
      mysql-test/suite/parts/t/partition_debug_innodb.test
      mysql-test/suite/parts/t/rpl_partition.test
 4010 magnus.blaudd@stripped	2012-06-14 [merge]
      Merge in patch for bug#14192728

    modified:
      sql/log_event.cc
=== modified file 'mysql-test/suite/parts/t/partition_alter1_1_innodb.test'
--- a/mysql-test/suite/parts/t/partition_alter1_1_innodb.test	revid:magnus.blaudd@stripped
+++ b/mysql-test/suite/parts/t/partition_alter1_1_innodb.test	revid:mattias.jonsson@stripped
@@ -1,5 +1,5 @@
-#Want to skip this test from daily Valgrind execution.
---source include/no_valgrind_without_big.inc
+# This test takes long time, so only run it with the --big-test mtr-flag.
+--source include/big_test.inc
 ################################################################################
 # t/partition_alter1_1_innodb.test                                             #
 #                                                                              #

=== modified file 'mysql-test/suite/parts/t/partition_basic_innodb.test'
--- a/mysql-test/suite/parts/t/partition_basic_innodb.test	revid:magnus.blaudd@stripped
+++ b/mysql-test/suite/parts/t/partition_basic_innodb.test	revid:mattias.jonsson@stripped
@@ -1,5 +1,3 @@
-#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
 ################################################################################

=== modified file 'mysql-test/suite/parts/t/partition_debug_innodb.test'
--- a/mysql-test/suite/parts/t/partition_debug_innodb.test	revid:magnus.blaudd@stripped
+++ b/mysql-test/suite/parts/t/partition_debug_innodb.test	revid:mattias.jonsson@stripped
@@ -1,6 +1,8 @@
 # Partitioning test that require debug features and InnoDB
 # including crashing tests.
 
+# This test takes long time, so only run it with the --big-test mtr-flag.
+--source include/big_test.inc
 --source include/have_debug.inc
 --source include/have_innodb.inc
 --source include/have_partition.inc

=== modified file 'mysql-test/suite/parts/t/rpl_partition.test'
--- a/mysql-test/suite/parts/t/rpl_partition.test	revid:magnus.blaudd@stripped
+++ b/mysql-test/suite/parts/t/rpl_partition.test	revid:mattias.jonsson@stripped
@@ -1,5 +1,5 @@
-#Want to skip this test from daily Valgrind execution
---source include/no_valgrind_without_big.inc
+# This test takes long time, so only run it with the --big-test mtr-flag.
+--source include/big_test.inc
 
 --source include/have_partition.inc
 --source include/have_innodb.inc

No bundle (reason: useless for push emails).