diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-06 09:22:39 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-06 09:22:39 +0300 |
| commit | 6dc157f8a6a6f12fcb6877c65c23a2e7692e38fe (patch) | |
| tree | a143f8592261301d3e0a42dcc33bddc3634227d9 /mysql-test/suite/rpl/t | |
| parent | 286acaa796cd3c7e7a8d20eba20673ae1ab70b61 (diff) | |
| parent | 8d6421aa48de5f1581e0706cc65c3515954bcead (diff) | |
| download | mariadb-git-6dc157f8a6a6f12fcb6877c65c23a2e7692e38fe.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/suite/rpl/t')
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_gtid_stop_start.test | 1 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_mdev12179.test | 1 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_await_ack.test | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_stop_start.test b/mysql-test/suite/rpl/t/rpl_gtid_stop_start.test index 4a192230859..2cf184a3401 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_stop_start.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_stop_start.test @@ -5,6 +5,7 @@ if (`SELECT $PS_PROTOCOL != 0`) --let $rpl_topology=1->2 --source include/rpl_init.inc --source include/have_innodb.inc +--source include/no_valgrind_without_big.inc --echo *** Test normal shutdown/restart of slave server configured as a GTID slave. *** diff --git a/mysql-test/suite/rpl/t/rpl_mdev12179.test b/mysql-test/suite/rpl/t/rpl_mdev12179.test index 2afcbf7b1e1..c8b9e665747 100644 --- a/mysql-test/suite/rpl/t/rpl_mdev12179.test +++ b/mysql-test/suite/rpl/t/rpl_mdev12179.test @@ -1,6 +1,7 @@ --source include/have_innodb.inc --let $rpl_topology=1->2 --source include/rpl_init.inc +--source include/no_valgrind_without_big.inc --connection server_2 call mtr.add_suppression("The automatically created table.*name may not be entirely in lowercase"); diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_await_ack.test b/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_await_ack.test index 5e9cda6466e..2ee7d0aa052 100644 --- a/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_await_ack.test +++ b/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_await_ack.test @@ -1,3 +1,5 @@ +--source include/no_valgrind_without_big.inc + # # Purpose: # This test validates that data is consistent between a primary and replica |