Make some tests "no valgrind without big", to reduce turnaround time.

dahlerlend · dahlerlend · commit f86e196b15e5 · 2015-02-16T15:07:46.000+01:00
binlog.binlog_enforce_gtid_consistency_create_select_consistent
binlog.binlog_enforce_gtid_consistency_create_select_violation
binlog.binlog_enforce_gtid_consistency_tmp_consistent
binlog.binlog_enforce_gtid_consistency_tmp_violation
binlog.binlog_enforce_gtid_consistency_trx_nontrx_consistent
binlog.binlog_enforce_gtid_consistency_trx_nontrx_violation
binlog.binlog_gtid_state_update_deadlock
rpl.rpl_no_gtid_split_statements
rpl.rpl_trx_boundary_parser_warning
main.partition_pruning

Approved by Anitha Gopi &lt;anitha.gopi@oracle.com&gt; over e-mail.
diff --git a/mysql-test/suite/binlog/t/binlog_enforce_gtid_consistency_create_select_consistent.test b/mysql-test/suite/binlog/t/binlog_enforce_gtid_consistency_create_select_consistent.test
@@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 --let $variable= default_storage_engine
 --source include/begin_replace_gtid_combination.inc
 
diff --git a/mysql-test/suite/binlog/t/binlog_enforce_gtid_consistency_create_select_violation.test b/mysql-test/suite/binlog/t/binlog_enforce_gtid_consistency_create_select_violation.test
@@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 --let $variable= default_storage_engine
 --source include/begin_replace_gtid_combination.inc
 
diff --git a/mysql-test/suite/binlog/t/binlog_enforce_gtid_consistency_tmp_consistent.test b/mysql-test/suite/binlog/t/binlog_enforce_gtid_consistency_tmp_consistent.test
@@ -1,5 +1,6 @@
 # Test sets gtid_mode explicitly so doesn't make sense to run in
 # multiple combinations.
+--source include/no_valgrind_without_big.inc
 --source include/not_gtid_enabled.inc
 
 --let $test_file= extra/binlog_tests/enforce_gtid_consistency_tmp_consistent.test
diff --git a/mysql-test/suite/binlog/t/binlog_enforce_gtid_consistency_tmp_violation.test b/mysql-test/suite/binlog/t/binlog_enforce_gtid_consistency_tmp_violation.test
@@ -1,5 +1,6 @@
 # Test sets gtid_mode explicitly so doesn't make sense to run in
 # multiple combinations.
+--source include/no_valgrind_without_big.inc
 --source include/not_gtid_enabled.inc
 
 --let $test_file= extra/binlog_tests/enforce_gtid_consistency_tmp_violation.test
diff --git a/mysql-test/suite/binlog/t/binlog_enforce_gtid_consistency_trx_nontrx_consistent.test b/mysql-test/suite/binlog/t/binlog_enforce_gtid_consistency_trx_nontrx_consistent.test
@@ -7,6 +7,7 @@
 # combinations for gtid_mode=on/off into combinations for
 # binlog_direct_non_transactional_updates=on/off.
 
+--source include/no_valgrind_without_big.inc
 --let $variable= binlog_direct_non_transactional_updates
 --source include/begin_replace_gtid_combination.inc
 
diff --git a/mysql-test/suite/binlog/t/binlog_enforce_gtid_consistency_trx_nontrx_violation.test b/mysql-test/suite/binlog/t/binlog_enforce_gtid_consistency_trx_nontrx_violation.test
@@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 --let $variable= binlog_direct_non_transactional_updates
 --source include/begin_replace_gtid_combination.inc
 
diff --git a/mysql-test/suite/binlog/t/binlog_gtid_state_update_deadlock.test b/mysql-test/suite/binlog/t/binlog_gtid_state_update_deadlock.test
@@ -31,6 +31,7 @@
 # 6. server_1_1 continues; it holds gtid_mode_lock and tries to acquire
 #    global_sid_lock.
 
+--source include/no_valgrind_without_big.inc
 --source include/have_debug_sync.inc
 # One binlog_format is enough.
 --source include/have_binlog_format_statement.inc
diff --git a/mysql-test/suite/rpl/t/rpl_no_gtid_split_statements.test b/mysql-test/suite/rpl/t/rpl_no_gtid_split_statements.test
@@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 --source include/not_gtid_enabled.inc
 --source include/not_mts_slave_parallel_workers.inc
 --source extra/rpl_tests/rpl_split_statements.test
diff --git a/mysql-test/suite/rpl/t/rpl_trx_boundary_parser_warning.test b/mysql-test/suite/rpl/t/rpl_trx_boundary_parser_warning.test
@@ -14,6 +14,7 @@
 
 # This test should run only on debug build
 --source include/have_debug.inc
+--source include/no_valgrind_without_big.inc
 # This test uses debug sync to stop the IO thread in the middle of a transaction
 --source include/have_debug_sync.inc
 
diff --git a/mysql-test/t/partition_pruning.test b/mysql-test/t/partition_pruning.test
@@ -2,6 +2,7 @@
 # Partition pruning tests. Currently we only detect which partitions to
 # prune, so the test is EXPLAINs.
 #
+--source include/no_valgrind_without_big.inc
 --source include/have_partition.inc
 let $verify_without_partitions=0;
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+--source include/no_valgrind_without_big.inc`
`1`	`2`	`--let $variable= default_storage_engine`
`2`	`3`	`--source include/begin_replace_gtid_combination.inc`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+--source include/no_valgrind_without_big.inc`
`1`	`2`	`--let $variable= binlog_direct_non_transactional_updates`
`2`	`3`	`--source include/begin_replace_gtid_combination.inc`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`# Partition pruning tests. Currently we only detect which partitions to`
`3`	`3`	`# prune, so the test is EXPLAINs.`
`4`	`4`	`#`
	`5`	`+--source include/no_valgrind_without_big.inc`
`5`	`6`	`--source include/have_partition.inc`
`6`	`7`	`let $verify_without_partitions=0;`
`7`	`8`