mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
galera.galera_wsrep_new_cluster: fix bad merge
This commit is contained in:
parent
111a752b96
commit
3d95737e55
2 changed files with 0 additions and 36 deletions
|
@ -9,14 +9,6 @@ connection node_2;
|
|||
Cleaning grastate.dat file ...
|
||||
Starting server ...
|
||||
connection node_1;
|
||||
connection node_2;
|
||||
connection node_2;
|
||||
Shutting down server ...
|
||||
connection node_1;
|
||||
connection node_2;
|
||||
Cleaning grastate.dat file ...
|
||||
Starting server ...
|
||||
connection node_1;
|
||||
SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
|
||||
VARIABLE_VALUE
|
||||
Primary
|
||||
|
|
|
@ -34,34 +34,6 @@
|
|||
--source include/start_mysqld.inc
|
||||
--source include/wait_until_ready.inc
|
||||
|
||||
# Save original auto_increment_offset values.
|
||||
--let $node_1=node_1
|
||||
--let $node_2=node_2
|
||||
--source include/auto_increment_offset_save.inc
|
||||
|
||||
--connection node_2
|
||||
--echo Shutting down server ...
|
||||
--source include/shutdown_mysqld.inc
|
||||
|
||||
--connection node_1
|
||||
|
||||
--let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
|
||||
--source include/wait_condition.inc
|
||||
|
||||
--connection node_2
|
||||
|
||||
#
|
||||
# Delete grastate.dat with safe_to_bootstrap: 0
|
||||
#
|
||||
--echo Cleaning grastate.dat file ...
|
||||
--remove_file $MYSQLTEST_VARDIR/mysqld.2/data/grastate.dat
|
||||
|
||||
--echo Starting server ...
|
||||
--let $restart_noprint=2
|
||||
--let $start_mysqld_params="--wsrep-new-cluster"
|
||||
--source include/start_mysqld.inc
|
||||
--source include/wait_until_ready.inc
|
||||
|
||||
--connection node_1
|
||||
|
||||
--let $wait_condition = SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
|
||||
|
|
Loading…
Reference in a new issue