diff options
author | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-04-02 15:43:46 +0300 |
---|---|---|
committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-04-02 15:45:31 +0300 |
commit | e10f9e6c810bf0ced6d79f486d6625d2ed04932e (patch) | |
tree | cb16d2199573f40fca1b181b1d0941db48e84e86 /mysql-test/suite/galera_3nodes | |
parent | a10e29cc6d209c701d3d455c1d58a983825e158e (diff) | |
download | mariadb-git-e10f9e6c810bf0ced6d79f486d6625d2ed04932e.tar.gz |
Adjust wsrep, galera, galera_3nodes, galera_sr and galera_3nodes_sr tests
after commit b5615eff0d00cfb4c60b9d1bf67094da7c2258a6
Diffstat (limited to 'mysql-test/suite/galera_3nodes')
4 files changed, 7 insertions, 1 deletions
diff --git a/mysql-test/suite/galera_3nodes/t/galera_garbd.test b/mysql-test/suite/galera_3nodes/t/galera_garbd.test index aaa9ecc8083..fa3cba0ab16 100644 --- a/mysql-test/suite/galera_3nodes/t/galera_garbd.test +++ b/mysql-test/suite/galera_3nodes/t/galera_garbd.test @@ -99,6 +99,7 @@ DROP TABLE t1; --echo Restarting node #3 to satisfy MTR's end-of-test checks --connection node_3 +let $restart_noprint=2; --source include/start_mysqld.inc # Restore original auto_increment_offset values. diff --git a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.test b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.test index 4733b686e93..c9c32f23230 100644 --- a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.test +++ b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.test @@ -59,6 +59,7 @@ INSERT INTO t1 VALUES (1); --connection node_2 --echo Starting server ... --let $start_mysqld_params = --wsrep_sst_auth=sst: --wsrep_sst_method=mysqldump --wsrep-sst-receive-address=[::1].1:$NODE_MYPORT_2 +let $restart_noprint=2; --source include/start_mysqld.inc #--source suite/galera/include/galera_load_provider.inc diff --git a/mysql-test/suite/galera_3nodes/t/galera_safe_to_bootstrap.test b/mysql-test/suite/galera_3nodes/t/galera_safe_to_bootstrap.test index 053c0bd8ce9..082cb546e87 100644 --- a/mysql-test/suite/galera_3nodes/t/galera_safe_to_bootstrap.test +++ b/mysql-test/suite/galera_3nodes/t/galera_safe_to_bootstrap.test @@ -87,8 +87,8 @@ CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; --source include/assert_grep.inc # Restart one node - --connection node_2 +let $restart_noprint=2; --let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.2.expect --source include/start_mysqld.inc @@ -153,15 +153,18 @@ SET SESSION wsrep_on = OFF; --connection node_1 --let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect +let $restart_noprint=2; --source include/start_mysqld.inc --source include/wait_until_connected_again.inc --connection node_2 --let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.2.expect +let $restart_noprint=2; --source include/start_mysqld.inc --connection node_3 --let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.3.expect +let $restart_noprint=2; --source include/start_mysqld.inc --let $wait_condition = SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; diff --git a/mysql-test/suite/galera_3nodes/t/galera_wsrep_schema.test b/mysql-test/suite/galera_3nodes/t/galera_wsrep_schema.test index 5c2cae75bd0..fb3af2cd25d 100644 --- a/mysql-test/suite/galera_3nodes/t/galera_wsrep_schema.test +++ b/mysql-test/suite/galera_3nodes/t/galera_wsrep_schema.test @@ -59,6 +59,7 @@ SELECT COUNT(*) = 2 FROM mysql.wsrep_cluster_members; #disabled SELECT COUNT(*) = 2 FROM mysql.wsrep_cluster_member_history WHERE last_view_id = (SELECT MAX(last_view_id) FROM mysql.wsrep_cluster_member_history); --connection node_2 +let $restart_noprint=2; --source include/start_mysqld.inc --source include/wait_until_connected_again.inc |