MDEV-30892 test galera.galera_log_bin is not deterministic

galera.galera_log_bin test created the test tables and executed initial DML into node 2 Then connection is switched to node 1, where ALTER TABLE was attempted. But there is no guarantee that the table to alter was yet replicated to node 1. The fix in this commit, creates the test tables in node 1 instead, so it is guaranteed that they are available for the later ALTER Signed-off-by: Julius Goryavsky <julius.goryavsky@mariadb.com>
MariaDB · May 3, 2023 · 9b6f87b · 9b6f87b
1 parent 7f96dd5
commit 9b6f87b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/mysql-test/suite/galera/r/galera_log_bin.result b/mysql-test/suite/galera/r/galera_log_bin.result
@@ -1,10 +1,10 @@
 connection node_2;
 connection node_1;
-connection node_1;
+connection node_2;
 set global wsrep_on=OFF;
 reset master;
 set global wsrep_on=ON;
-connection node_2;
+connection node_1;
 set global wsrep_on=OFF;
 reset master;
 set global wsrep_on=ON;

diff --git a/mysql-test/suite/galera/r/galera_log_bin_ext.result b/mysql-test/suite/galera/r/galera_log_bin_ext.result
@@ -2,11 +2,11 @@ connection node_2;
 connection node_1;
 connection node_1;
 connection node_2;
-connection node_1;
+connection node_2;
 set global wsrep_on=OFF;
 reset master;
 set global wsrep_on=ON;
-connection node_2;
+connection node_1;
 set global wsrep_on=OFF;
 reset master;
 set global wsrep_on=ON;

diff --git a/mysql-test/suite/galera/r/galera_log_bin_ext_mariabackup.result b/mysql-test/suite/galera/r/galera_log_bin_ext_mariabackup.result
@@ -2,11 +2,11 @@ connection node_2;
 connection node_1;
 connection node_1;
 connection node_2;
-connection node_1;
+connection node_2;
 set global wsrep_on=OFF;
 reset master;
 set global wsrep_on=ON;
-connection node_2;
+connection node_1;
 set global wsrep_on=OFF;
 reset master;
 set global wsrep_on=ON;

diff --git a/mysql-test/suite/galera/r/galera_log_bin_opt.result b/mysql-test/suite/galera/r/galera_log_bin_opt.result
@@ -1,10 +1,10 @@
 connection node_2;
 connection node_1;
-connection node_1;
+connection node_2;
 set global wsrep_on=OFF;
 reset master;
 set global wsrep_on=ON;
-connection node_2;
+connection node_1;
 set global wsrep_on=OFF;
 reset master;
 set global wsrep_on=ON;

diff --git a/mysql-test/suite/galera/t/galera_log_bin.inc b/mysql-test/suite/galera/t/galera_log_bin.inc
@@ -1,11 +1,11 @@
 --source include/galera_cluster.inc
 --source include/force_restart.inc
 
---connection node_1
+--connection node_2
 set global wsrep_on=OFF;
 reset master;
 set global wsrep_on=ON;
---connection node_2
+--connection node_1
 set global wsrep_on=OFF;
 reset master;
 set global wsrep_on=ON;

diff --git a/mysql-test/suite/galera/t/galera_log_bin_sst.inc b/mysql-test/suite/galera/t/galera_log_bin_sst.inc
@@ -6,11 +6,11 @@
 --let $node_2=node_2
 --source include/auto_increment_offset_save.inc
 
---connection node_1
+--connection node_2
 set global wsrep_on=OFF;
 reset master;
 set global wsrep_on=ON;
---connection node_2
+--connection node_1
 set global wsrep_on=OFF;
 reset master;
 set global wsrep_on=ON;