diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-05-28 08:47:51 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-05-28 08:47:51 +0300 |
| commit | 77cf9fa8b3e59ee08e53ce483d4b5975304047f9 (patch) | |
| tree | 6491167dab34ff78ed329e2c9f0105cb550745ba | |
| parent | 288b8016961e390ca71dd4657efdfcec388f1494 (diff) | |
| download | mariadb-git-bb-10.5-jan.tar.gz | |
Fix test case galera_vote_rejoin_ddlbb-10.5-jan
| -rw-r--r-- | mysql-test/suite/galera/r/galera_vote_rejoin_ddl.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/galera_vote_rejoin_ddl.test | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/suite/galera/r/galera_vote_rejoin_ddl.result b/mysql-test/suite/galera/r/galera_vote_rejoin_ddl.result index 6ad7ac75314..9f859f803f5 100644 --- a/mysql-test/suite/galera/r/galera_vote_rejoin_ddl.result +++ b/mysql-test/suite/galera/r/galera_vote_rejoin_ddl.result @@ -1,12 +1,14 @@ connection node_2; connection node_1; +connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3; +connect node_4, 127.0.0.1, root, , test, $NODE_MYPORT_4; connection node_1; connection node_2; -connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3; +connection node_3; +connection node_4; connection node_3; SET GLOBAL wsrep_provider_options = 'gmcast.isolate = 1'; connection node_1; -connect node_4, 127.0.0.1, root, , test, $NODE_MYPORT_4; connection node_4; SET SESSION wsrep_on=OFF; CREATE TABLE t1 (f1 INTEGER); diff --git a/mysql-test/suite/galera/t/galera_vote_rejoin_ddl.test b/mysql-test/suite/galera/t/galera_vote_rejoin_ddl.test index ca75d33b7d7..869b559ada8 100644 --- a/mysql-test/suite/galera/t/galera_vote_rejoin_ddl.test +++ b/mysql-test/suite/galera/t/galera_vote_rejoin_ddl.test @@ -6,19 +6,18 @@ --source include/galera_cluster.inc --source include/big_test.inc +# Connect to extra nodes +--connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3 +--connect node_4, 127.0.0.1, root, , test, $NODE_MYPORT_4 + # Save original auto_increment_offset values. --let $node_1=node_1 --let $node_2=node_2 ---source include/auto_increment_offset_save.inc -# The following has to be set hard as these connection doesn't yet exists and -# the auto_increment_offset value changes during the lifetime of the servers. --let $node_3=node_3 ---let $auto_increment_offset_node_3 = 3; --let $node_4=node_4 ---let $auto_increment_offset_node_4 = 4; +--source include/auto_increment_offset_save.inc # Isolate node #3 ---connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3 --connection node_3 SET GLOBAL wsrep_provider_options = 'gmcast.isolate = 1'; @@ -28,7 +27,6 @@ SET GLOBAL wsrep_provider_options = 'gmcast.isolate = 1'; --source include/wait_condition.inc # Introduce inconsistency on node #4 ---connect node_4, 127.0.0.1, root, , test, $NODE_MYPORT_4 --connection node_4 SET SESSION wsrep_on=OFF; CREATE TABLE t1 (f1 INTEGER); |