1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-15948 Followup commit

Browse Source 
* Increased timeout counter in galera_wait_ready.inc

* Replaced useless include/wait_until_ready.inc after start_mysqld.inc
  in galera_st_*.inc with wait_condition on cluster size.
This commit is contained in:
Daniele Sciascia 2018-04-23 12:00:49 +02:00
parent 9e5671f1cc
commit 63e5307afd
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/galera_wait_ready.inc
View File

@ -6,7 +6,7 @@
--enable_reconnect --enable_reconnect
--disable_query_log --disable_query_log
--disable_result_log --disable_result_log
let $wait_counter = 300; let $wait_counter = 600;
while ($wait_counter) while ($wait_counter)
{ {
--disable_abort_on_error --disable_abort_on_error

4
mysql-test/suite/galera/include/galera_st_clean_slave.inc
View File

@ -64,7 +64,9 @@ INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after');
--connection node_2 --connection node_2
--echo Starting server ... --echo Starting server ...
--source include/start_mysqld.inc --source include/start_mysqld.inc
--source include/wait_until_ready.inc
--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
--source include/wait_condition.inc
SET AUTOCOMMIT=OFF; SET AUTOCOMMIT=OFF;
START TRANSACTION; START TRANSACTION;

4
mysql-test/suite/galera/include/galera_st_kill_slave.inc
View File

@ -59,7 +59,9 @@ INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after');
--echo Starting server ... --echo Starting server ...
--source include/start_mysqld.inc --source include/start_mysqld.inc
--source include/wait_until_ready.inc
--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
--source include/wait_condition.inc
SET AUTOCOMMIT=OFF; SET AUTOCOMMIT=OFF;
START TRANSACTION; START TRANSACTION;

4
mysql-test/suite/galera/include/galera_st_kill_slave_ddl.inc
View File

@ -72,7 +72,9 @@ INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
--connection node_2 --connection node_2
--echo Starting server ... --echo Starting server ...
--source include/start_mysqld.inc --source include/start_mysqld.inc
--source include/wait_until_ready.inc
--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
--source include/wait_condition.inc
SET AUTOCOMMIT=OFF; SET AUTOCOMMIT=OFF;
START TRANSACTION; START TRANSACTION;

4
mysql-test/suite/galera/include/galera_st_shutdown_slave.inc
View File

@ -56,7 +56,9 @@ INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after');
--connection node_2 --connection node_2
--echo Starting server ... --echo Starting server ...
--source include/start_mysqld.inc --source include/start_mysqld.inc
--source include/wait_until_ready.inc
--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
--source include/wait_condition.inc
SET AUTOCOMMIT=OFF; SET AUTOCOMMIT=OFF;
START TRANSACTION; START TRANSACTION;