diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-01 11:33:45 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-01 11:33:45 +0300 |
| commit | 4e1fa7f63da580c1e0e4256bc4af3c02cdc51939 (patch) | |
| tree | 6ac1589c98dbf15a465365f4f16a09da51ea8c48 /sql/wsrep_applier.cc | |
| parent | ff81faf670e083e1da4f3e7bce33fe9104410b2c (diff) | |
| parent | 2f3968d98f8d90a9a9747e5b89c8f07efc6732e8 (diff) | |
| download | mariadb-git-4e1fa7f63da580c1e0e4256bc4af3c02cdc51939.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/wsrep_applier.cc')
| -rw-r--r-- | sql/wsrep_applier.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/wsrep_applier.cc b/sql/wsrep_applier.cc index 93d4ebc495d..465d1f25b5b 100644 --- a/sql/wsrep_applier.cc +++ b/sql/wsrep_applier.cc @@ -218,12 +218,15 @@ wsrep_cb_status_t wsrep_apply_cb(void* const ctx, { THD* const thd((THD*)ctx); + assert(thd->wsrep_apply_toi == false); + // Allow tests to block the applier thread using the DBUG facilities. DBUG_EXECUTE_IF("sync.wsrep_apply_cb", { 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))); };); @@ -383,7 +386,7 @@ wsrep_cb_status_t wsrep_commit_cb(void* const ctx, mysql_mutex_unlock(&LOCK_wsrep_slave_threads); } - if (*exit == false && thd->wsrep_applier) + if (thd->wsrep_applier) { /* From trans_begin() */ thd->variables.option_bits|= OPTION_BEGIN; |