3845 Nuno Carvalho 2012-03-23
BUG#13812893 - RPL.RPL_GTID_PARALLEL TEST IS TIMING OUT ON PB2
BUG#13813422 - RPL_NON_DIRECT_STM_MIXING_ENGINES TEST TIMING OUT ON PB2
Some replication tests take a long time to run, this gets worse when
they are run on platforms such as valgrind or gcov.
To avoid false failures due to timeout, now this tests are labeled as
big. Default weekly was updated to run rpl big tests.
modified:
mysql-test/collections/default.weekly
mysql-test/collections/disabled-per-push.list
mysql-test/suite/rpl/t/rpl_gtid_parallel.test
mysql-test/suite/rpl/t/rpl_gtid_stress_failover.test
mysql-test/suite/rpl/t/rpl_mixed_mixing_engines.test
mysql-test/suite/rpl/t/rpl_mixed_mts_crash_safe.test
mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe.test
mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum.test
mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test
mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test
mysql-test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test
mysql-test/suite/rpl/t/rpl_row_mixing_engines.test
mysql-test/suite/rpl/t/rpl_row_mts_crash_safe.test
mysql-test/suite/rpl/t/rpl_row_mts_rec_crash_safe.test
mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
mysql-test/suite/rpl/t/rpl_stm_mixed_crash_safe.test
mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test
mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test
mysql-test/suite/rpl/t/rpl_stm_mts_rec_crash_safe.test
3844 Bjorn Munch 2012-03-23 [merge]
Upmerge fixes from 7.2 release branches
modified:
INSTALL-SOURCE
INSTALL-WIN-SOURCE
cmake/make_dist.cmake.in
cmake/mysql_version.cmake
cmake/package_name.cmake
support-files/CMakeLists.txt
=== modified file 'mysql-test/collections/default.weekly'
--- a/mysql-test/collections/default.weekly 2012-02-01 05:22:33 +0000
+++ b/mysql-test/collections/default.weekly 2012-03-23 11:48:18 +0000
@@ -28,9 +28,10 @@ perl mysql-test-run.pl --force --timer -
# Additional replication configurations
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=all_binlog_checksum-debug --experimental=collections/default.experimental --mysqld=--binlog-checksum=CRC32 --vardir=var-all_binlog_checksum-debug --suite=main,binlog,innodb,federated,rpl,sys_vars,perfschema --skip-test-list=collections/disabled-weekly.list
-perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_relay-debug --vardir=var-rpl_crash_safe_relay-debug --suite=rpl --mysqld=--relay-log-info-repository=TABLE --skip-test-list=collections/disabled-daily.list
-perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_master-debug --vardir=var-rpl_crash_safe_master-debug --suite=rpl --mysqld=--master-info-repository=TABLE --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --parallel=auto --comment=all_binlog_checksum-debug --experimental=collections/default.experimental --mysqld=--binlog-checksum=CRC32 --vardir=var-all_binlog_checksum-debug --suite=main,binlog,innodb,federated,rpl,sys_vars,perfschema --skip-test-list=collections/disabled-weekly.list
+perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_relay-debug --vardir=var-rpl_crash_safe_relay-debug --suite=rpl --mysqld=--relay-log-info-repository=TABLE --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_master-debug --vardir=var-rpl_crash_safe_master-debug --suite=rpl --mysqld=--master-info-repository=TABLE --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog-debug-big --vardir=rpl_binlog-debug-big --suite=rpl --skip-test-list=collections/disabled-daily.list
#Engine independent tests
@@ -64,9 +65,9 @@ perl mysql-test-run.pl --force --timer -
# Additional replication configurations
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=all_binlog_checksum --experimental=collections/default.experimental --mysqld=--binlog-checksum=CRC32 --vardir=var-all_binlog_checksum --suite=main,binlog,innodb,federated,rpl,sys_vars,perfschema --skip-test-list=collections/disabled-weekly.list
-perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_relay --vardir=var-rpl_crash_safe_relay --suite=rpl --mysqld=--relay-log-info-repository=TABLE --skip-test-list=collections/disabled-daily.list
-perl mysql-test-run.pl --force --timer --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_master --vardir=var-rpl_crash_safe_master --suite=rpl --mysqld=--master-info-repository=TABLE --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --parallel=auto --comment=all_binlog_checksum --experimental=collections/default.experimental --mysqld=--binlog-checksum=CRC32 --vardir=var-all_binlog_checksum --suite=main,binlog,innodb,federated,rpl,sys_vars,perfschema --skip-test-list=collections/disabled-weekly.list
+perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_relay --vardir=var-rpl_crash_safe_relay --suite=rpl --mysqld=--relay-log-info-repository=TABLE --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_master --vardir=var-rpl_crash_safe_master --suite=rpl --mysqld=--master-info-repository=TABLE --skip-test-list=collections/disabled-daily.list
#Engine independent tests
perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --parallel=auto --comment=eits-tests-myisam-engine-big --experimental=collections/default.experimental --vardir=var-stmt-eits-tests-myisam-engine-big --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=myisam --skip-test-list=collections/disabled-weekly.list
@@ -77,7 +78,7 @@ perl mysql-test-run.pl --timer --force -
perl mysql-test-run.pl --timer --force --parallel=auto --comment=eits-rpl-binlog-mixed-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-binlog-mixed-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --do-test=rpl --mysqld=--binlog-format=mixed --skip-test-list=collections/disabled-weekly.list
# Multi-Thread Slave
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix-MTS --vardir=var-mts-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --unit-tests --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0
+perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --debug-server --parallel=auto --comment=n_mix-MTS-debug-big --vardir=var-n_mix-MTS-debug-big --suite=rpl --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --unit-tests --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0
# Run with 4K page size
perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix_4k_size --vardir=var-n_mix_4k_size --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --unit-tests --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin
=== modified file 'mysql-test/collections/disabled-per-push.list'
--- a/mysql-test/collections/disabled-per-push.list 2010-06-02 12:24:55 +0000
+++ b/mysql-test/collections/disabled-per-push.list 2012-03-23 11:48:18 +0000
@@ -65,7 +65,6 @@ rpl.rpl_mixed_binlog_max_cache_size : ls
rpl.rpl_mixed_bit_pk : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
rpl.rpl_mixed_ddl_dml : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
rpl.rpl_mixed_implicit_commit_binlog : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
-rpl.rpl_mixed_mixing_engines : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
rpl.rpl_mixed_row_innodb : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
rpl.rpl_mix_found_rows : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
rpl.rpl_multi_delete2 : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
@@ -78,9 +77,6 @@ rpl.rpl_multi_update : lsoares 2010-05-2
rpl.rpl_mysql_upgrade : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
rpl.rpl_name_const : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
rpl.rpl_nondeterministic_functions : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
-rpl.rpl_non_direct_mixed_mixing_engines : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
-rpl.rpl_non_direct_row_mixing_engines : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
-rpl.rpl_non_direct_stm_mixing_engines : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
rpl.rpl_not_null_myisam : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
rpl.rpl_optimize : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
rpl.rpl_ps : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
@@ -106,7 +102,6 @@ rpl.rpl_row_implicit_commit_binlog : lso
rpl.rpl_row_inexist_tbl : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
rpl.rpl_row_loaddata_concurrent : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
rpl.rpl_row_max_relay_size : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
-rpl.rpl_row_mixing_engines : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
rpl.rpl_row_reset_slave : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
rpl.rpl_row_show_relaylog_events : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
rpl.rpl_row_sp001 : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
@@ -160,7 +155,6 @@ rpl.rpl_stm_loaddata_concurrent : lsoare
rpl.rpl_stm_loadfile : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
rpl.rpl_stm_log : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
rpl.rpl_stm_max_relay_size : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
-rpl.rpl_stm_mixing_engines : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
rpl.rpl_stm_mix_show_relaylog_events : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
rpl.rpl_stm_multi_query : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
rpl.rpl_stm_no_op : lsoares 2010-05-26 WL#5408 Reduce Pushbuild2 turnaround times for rpl suite.
=== modified file 'mysql-test/suite/rpl/t/rpl_gtid_parallel.test'
--- a/mysql-test/suite/rpl/t/rpl_gtid_parallel.test 2012-02-18 22:34:03 +0000
+++ b/mysql-test/suite/rpl/t/rpl_gtid_parallel.test 2012-03-23 11:48:18 +0000
@@ -24,6 +24,7 @@
#
# Implemented as part of WL#3584: Global Transaction Identifiers
+--source include/big_test.inc
--source include/have_gtid.inc
--source include/master-slave.inc
--source include/not_windows.inc
=== modified file 'mysql-test/suite/rpl/t/rpl_gtid_stress_failover.test'
--- a/mysql-test/suite/rpl/t/rpl_gtid_stress_failover.test 2012-02-18 22:37:27 +0000
+++ b/mysql-test/suite/rpl/t/rpl_gtid_stress_failover.test 2012-03-23 11:48:18 +0000
@@ -79,6 +79,7 @@
#
# Created as part of WL#3584: Global Transaction Identifiers
+--source include/big_test.inc
--source include/have_gtid.inc
# This test case has path issues when executing the
=== modified file 'mysql-test/suite/rpl/t/rpl_mixed_mixing_engines.test'
--- a/mysql-test/suite/rpl/t/rpl_mixed_mixing_engines.test 2012-01-11 07:29:43 +0000
+++ b/mysql-test/suite/rpl/t/rpl_mixed_mixing_engines.test 2012-03-23 11:48:18 +0000
@@ -2,6 +2,7 @@
# This test cases evaluates the mixture of non-transactional and transcational
# tables. For further details, please, read WL#2687 and WL#5072.
###################################################################################
+--source include/big_test.inc
--source include/have_binlog_format_mixed.inc
--source include/master-slave.inc
--source include/have_innodb.inc
=== modified file 'mysql-test/suite/rpl/t/rpl_mixed_mts_crash_safe.test'
--- a/mysql-test/suite/rpl/t/rpl_mixed_mts_crash_safe.test 2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_mixed_mts_crash_safe.test 2012-03-23 11:48:18 +0000
@@ -1,3 +1,4 @@
+--source include/big_test.inc
--source include/master-slave.inc
--source include/have_binlog_format_mixed.inc
--source include/have_innodb.inc
=== modified file 'mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe.test'
--- a/mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe.test 2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe.test 2012-03-23 11:48:18 +0000
@@ -1,3 +1,4 @@
+--source include/big_test.inc
--source include/master-slave.inc
--source include/have_binlog_format_mixed.inc
--source include/have_innodb.inc
=== modified file 'mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum.test'
--- a/mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum.test 2011-08-19 18:13:59 +0000
+++ b/mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum.test 2012-03-23 11:48:18 +0000
@@ -1 +1,2 @@
+--source include/big_test.inc
--source rpl_mixed_mts_rec_crash_safe.test
=== modified file 'mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test'
--- a/mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test 2012-01-11 07:29:43 +0000
+++ b/mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test 2012-03-23 11:48:18 +0000
@@ -2,6 +2,7 @@
# This test cases evaluates the mixture of non-transactional and transcational
# tables. For further details, please, read WL#2687 and WL#5072.
###################################################################################
+--source include/big_test.inc
--source include/have_binlog_format_mixed.inc
--source include/master-slave.inc
--source include/have_innodb.inc
=== modified file 'mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test'
--- a/mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test 2012-01-11 07:29:43 +0000
+++ b/mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test 2012-03-23 11:48:18 +0000
@@ -2,6 +2,7 @@
# This test cases evaluates the mixture of non-transactional and transcational
# tables. For further details, please, read WL#2687 and WL#5072.
###################################################################################
+--source include/big_test.inc
--source include/have_binlog_format_row.inc
--source include/master-slave.inc
--source include/have_innodb.inc
=== modified file 'mysql-test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test'
--- a/mysql-test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test 2012-01-11 07:29:43 +0000
+++ b/mysql-test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test 2012-03-23 11:48:18 +0000
@@ -2,6 +2,7 @@
# This test cases evaluates the mixture of non-transactional and transcational
# tables. For further details, please, read WL#2687 and WL#5072.
###################################################################################
+--source include/big_test.inc
--source include/have_binlog_format_statement.inc
--source include/master-slave.inc
--source include/have_innodb.inc
=== modified file 'mysql-test/suite/rpl/t/rpl_row_mixing_engines.test'
--- a/mysql-test/suite/rpl/t/rpl_row_mixing_engines.test 2012-01-11 07:29:43 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_mixing_engines.test 2012-03-23 11:48:18 +0000
@@ -2,6 +2,7 @@
# This test cases evaluates the mixture of non-transactional and transcational
# tables. For further details, please, read WL#2687 and WL#5072.
###################################################################################
+--source include/big_test.inc
--source include/have_binlog_format_row.inc
--source include/master-slave.inc
--source include/have_innodb.inc
=== modified file 'mysql-test/suite/rpl/t/rpl_row_mts_crash_safe.test'
--- a/mysql-test/suite/rpl/t/rpl_row_mts_crash_safe.test 2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_mts_crash_safe.test 2012-03-23 11:48:18 +0000
@@ -1,3 +1,4 @@
+--source include/big_test.inc
--source include/master-slave.inc
--source include/have_binlog_format_row.inc
--source include/have_innodb.inc
=== modified file 'mysql-test/suite/rpl/t/rpl_row_mts_rec_crash_safe.test'
--- a/mysql-test/suite/rpl/t/rpl_row_mts_rec_crash_safe.test 2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_mts_rec_crash_safe.test 2012-03-23 11:48:18 +0000
@@ -1,3 +1,4 @@
+--source include/big_test.inc
--source include/master-slave.inc
--source include/have_binlog_format_row.inc
--source include/have_innodb.inc
=== modified file 'mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test'
--- a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test 2012-03-06 14:29:42 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test 2012-03-23 11:48:18 +0000
@@ -4,6 +4,7 @@
# Purpose: To test changes to mysqlbinlog for row based bin logs #
# We are using .opt file since we need small binlog size #
##################################################################
+--source include/big_test.inc
# Include Section
# Make sure that we have row based bin log
-- source include/have_binlog_format_row.inc
=== modified file 'mysql-test/suite/rpl/t/rpl_stm_mixed_crash_safe.test'
--- a/mysql-test/suite/rpl/t/rpl_stm_mixed_crash_safe.test 2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_mixed_crash_safe.test 2012-03-23 11:48:18 +0000
@@ -1,3 +1,4 @@
+--source include/big_test.inc
--source include/master-slave.inc
--source include/not_embedded.inc
--source include/not_valgrind.inc
=== modified file 'mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test'
--- a/mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test 2012-01-11 07:29:43 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test 2012-03-23 11:48:18 +0000
@@ -2,6 +2,7 @@
# This test cases evaluates the mixture of non-transactional and transcational
# tables. For further details, please, read WL#2687 and WL#5072.
###################################################################################
+--source include/big_test.inc
--source include/have_binlog_format_statement.inc
--source include/master-slave.inc
--source include/have_innodb.inc
=== modified file 'mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test'
--- a/mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test 2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test 2012-03-23 11:48:18 +0000
@@ -1,3 +1,4 @@
+--source include/big_test.inc
--source include/master-slave.inc
--source include/have_binlog_format_statement.inc
--source include/have_innodb.inc
=== modified file 'mysql-test/suite/rpl/t/rpl_stm_mts_rec_crash_safe.test'
--- a/mysql-test/suite/rpl/t/rpl_stm_mts_rec_crash_safe.test 2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_mts_rec_crash_safe.test 2012-03-23 11:48:18 +0000
@@ -1,3 +1,4 @@
+--source include/big_test.inc
--source include/master-slave.inc
--source include/have_binlog_format_statement.inc
--source include/have_innodb.inc
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (nuno.carvalho:3844 to 3845) Bug#13812893Bug#13813422 | Nuno Carvalho | 26 Mar |
