Merge branch '10.4-MDEV-22729-2' into 10.4

MariaDB · Jun 25, 2020 · 141b390 · 141b390
2 parents dc68846 + 7bd11fb
commit 141b390
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 19 deletions.
diff --git a/mysql-test/suite/galera/r/galera_slave_replay.result b/mysql-test/suite/galera/r/galera_slave_replay.result
@@ -70,7 +70,6 @@ SET AUTOCOMMIT=ON;
 START TRANSACTION;
 UPDATE t1 SET f2 = 'd' WHERE f1 = 3;
 connection node_2a;
-SET GLOBAL wsrep_provider_options = 'dbug=d,commit_monitor_master_enter_sync';
 SET GLOBAL debug_dbug = "d,sync.wsrep_apply_cb";
 connection node_1;
 UPDATE test.t1 SET f2 = 'e' WHERE f1 = 3;
@@ -82,17 +81,14 @@ connection node_2a;
 SET GLOBAL debug_dbug = "";
 SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb";
 connection node_2a;
-SET GLOBAL wsrep_provider_options = 'dbug=';
-SET GLOBAL wsrep_provider_options = 'signal=commit_monitor_master_enter_sync';
-SET DEBUG_SYNC = "RESET";
-connection node_2a;
 set session wsrep_sync_wait=15;
 SELECT COUNT(*) = 1 FROM test.t1 WHERE f2 = 'e';
 COUNT(*) = 1
 1
 set session wsrep_sync_wait=0;
 STOP SLAVE;
 RESET SLAVE;
+SET DEBUG_SYNC = "RESET";
 DROP TABLE t1;
 connection node_3;
 DROP TABLE t1;

diff --git a/mysql-test/suite/galera/t/galera_slave_replay.test b/mysql-test/suite/galera/t/galera_slave_replay.test
@@ -7,6 +7,7 @@
 #
 
 --source include/have_innodb.inc
+--source include/have_log_bin.inc
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
 --source include/galera_have_debug_sync.inc
@@ -31,10 +32,10 @@ RESET MASTER;
 
 
 #
-# nodes 1 and 2 form a galera cluster, node 2 operates as slave for native MariaDB naster in node 3
+# nodes 1 and 2 form a galera cluster, node 2 operates as slave for native MariaDB master in node 3
 #
 --disable_query_log
---eval CHANGE MASTER TO  MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_3;
+--eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_3;
 --enable_query_log
 START SLAVE;
 
@@ -154,10 +155,6 @@ UPDATE t1 SET f2 = 'd' WHERE f1 = 3;
 --let $wait_condition = SELECT COUNT(*) = 4 FROM test.t1;
 --source include/wait_condition.inc
 
-# Block the commit
---let $galera_sync_point = commit_monitor_master_enter_sync
---source include/galera_set_sync_point.inc
-
 # block applier
 SET GLOBAL debug_dbug = "d,sync.wsrep_apply_cb";
 
@@ -176,20 +173,13 @@ SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_cb_reached";
 COMMIT;
 
 --connection node_2a
---let $wait_condition = SELECT VARIABLE_VALUE = $expected_cert_failures FROM  INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_cert_failures'
+--let $wait_condition = SELECT VARIABLE_VALUE = $expected_cert_failures FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_cert_failures'
 --source include/wait_condition.inc
 
 # release the applier from node 1
 SET GLOBAL debug_dbug = "";
 SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb";
 
-
-# Unblock the async slave commit
---connection node_2a
---source include/galera_clear_sync_point.inc
---source include/galera_signal_sync_point.inc
-SET DEBUG_SYNC = "RESET";
-
 --connection node_2a
 
 set session wsrep_sync_wait=15;
@@ -198,6 +188,7 @@ set session wsrep_sync_wait=0;
 
 STOP SLAVE;
 RESET SLAVE;
+SET DEBUG_SYNC = "RESET";
 
 DROP TABLE t1;