diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-02-04 14:11:46 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-02-04 14:11:46 +0100 |
| commit | 9ed8deb656d9378fc9c1c7fb12c15674b6323ab0 (patch) | |
| tree | 5bc8e7e4182b9e5da99d2a2ba40736f3ac450efe /mysql-test/suite/galera_3nodes/r | |
| parent | 3351dfaab0599268eaf25f9d6995ef128910a8b9 (diff) | |
| parent | d87979b48c614dbba4afd1b235307ee354c27719 (diff) | |
| download | mariadb-git-9ed8deb656d9378fc9c1c7fb12c15674b6323ab0.tar.gz | |
Merge branch '10.6' into 10.7
Diffstat (limited to 'mysql-test/suite/galera_3nodes/r')
| -rw-r--r-- | mysql-test/suite/galera_3nodes/r/GCF-363.result | 5 | ||||
| -rw-r--r-- | mysql-test/suite/galera_3nodes/r/galera_2_cluster.result | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/suite/galera_3nodes/r/GCF-363.result b/mysql-test/suite/galera_3nodes/r/GCF-363.result index fbcbac3a398..ca6d354f28f 100644 --- a/mysql-test/suite/galera_3nodes/r/GCF-363.result +++ b/mysql-test/suite/galera_3nodes/r/GCF-363.result @@ -7,6 +7,10 @@ connection node_3; connection node_1; CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 CHAR(1)) ENGINE=InnoDB; connection node_1; +connection node_1; +connection node_2; +connection node_1; +CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 CHAR(1)) ENGINE=InnoDB; SET GLOBAL wsrep_on=OFF; INSERT INTO t1 VALUES (1, 'a'); SET GLOBAL wsrep_on=ON; @@ -48,3 +52,4 @@ connection node_3; CALL mtr.add_suppression("WSREP: Vote 0 \\\(success\\\) on (.*) is inconsistent with group. Leaving cluster."); CALL mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on "); CALL mtr.add_suppression("Plugin 'InnoDB' will be forced to shutdown"); +connection node_1; diff --git a/mysql-test/suite/galera_3nodes/r/galera_2_cluster.result b/mysql-test/suite/galera_3nodes/r/galera_2_cluster.result index 87898891f9b..5214eafa1c8 100644 --- a/mysql-test/suite/galera_3nodes/r/galera_2_cluster.result +++ b/mysql-test/suite/galera_3nodes/r/galera_2_cluster.result @@ -75,15 +75,19 @@ connection node_2; SET GLOBAL wsrep_on = OFF; RESET MASTER; SET GLOBAL wsrep_on = ON; +CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); connection node_3; SET GLOBAL wsrep_on = OFF; RESET MASTER; SET GLOBAL wsrep_on = ON; +CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); connection node_5; SET GLOBAL wsrep_on = OFF; RESET MASTER; SET GLOBAL wsrep_on = ON; +CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); connection node_6; SET GLOBAL wsrep_on = OFF; RESET MASTER; SET GLOBAL wsrep_on = ON; +CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); |