Merge pull request #228 from codership/mysql-wsrep-bugs_5.6-v25-GCF-1058-followup

GCF-1058 MTR test galera.MW-86 fails on repeated runs

Author: sciascid

mysql-test/suite/galera/r/MW-86-wait1.result

@@ -5,6 +5,7 @@ SET SESSION wsrep_sync_wait = 1;
 SET GLOBAL debug = "+d,sync.wsrep_apply_cb";
 CREATE TABLE t_wait1 (f1 INTEGER) ENGINE=InnoDB;
 INSERT INTO t_wait1 VALUES (1);
+SET SESSION debug_sync = "now WAIT_FOR sync.wsrep_apply_cb_reached";
 SHOW BINARY LOGS;
 SHOW BINLOG EVENTS;
 SHOW COLUMNS FROM t1;

mysql-test/suite/galera/r/MW-86-wait8.result

@@ -6,6 +6,7 @@ SET GLOBAL debug = "+d,sync.wsrep_apply_cb";
 CREATE TABLE t_wait8 (f1 INTEGER) ENGINE=InnoDB;
 INSERT INTO t_wait8 VALUES (1);
 SET GLOBAL wsrep_provider_options = "repl.causal_read_timeout=PT0.1S";
+SET SESSION debug_sync = "now WAIT_FOR sync.wsrep_apply_cb_reached";
 SHOW BINARY LOGS;
 SHOW BINLOG EVENTS;
 SHOW COLUMNS FROM t1;

mysql-test/suite/galera/t/MW-86-wait1.test

@@ -22,6 +22,8 @@ INSERT INTO t_wait1 VALUES (1);
 
 --connection node_2
 
+SET SESSION debug_sync = "now WAIT_FOR sync.wsrep_apply_cb_reached";
+
 --disable_result_log
 
 SHOW BINARY LOGS;

mysql-test/suite/galera/t/MW-86-wait8.test

@@ -23,6 +23,8 @@ INSERT INTO t_wait8 VALUES (1);
 --let $wsrep_provider_options_orig = `SELECT @@wsrep_provider_options`
 SET GLOBAL wsrep_provider_options = "repl.causal_read_timeout=PT0.1S";
 
+SET SESSION debug_sync = "now WAIT_FOR sync.wsrep_apply_cb_reached";
+
 --disable_result_log
 
 --error ER_LOCK_WAIT_TIMEOUT

sql/wsrep_applier.cc

@@ -207,7 +207,8 @@ wsrep_cb_status_t wsrep_apply_cb(void* const             ctx,
                  {
                    const char act[]=
                      "now "
-                     "wait_for signal.wsrep_apply_cb";
+                     "SIGNAL sync.wsrep_apply_cb_reached "
+                     "WAIT_FOR signal.wsrep_apply_cb";
                    DBUG_ASSERT(!debug_sync_set_action(thd,
                                                       STRING_WITH_LEN(act)));
                  };);