diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-21 19:20:44 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-21 19:20:44 +0100 |
| commit | 09a2107b1b2f5567b8a50afec9e54a33284c6233 (patch) | |
| tree | a9f544eb24b6b5ec510fa580cd997356671996d3 /sql/rpl_parallel.cc | |
| parent | bbf0c9d4c35034c8634cd9607712d94fac089127 (diff) | |
| parent | 0d622bed4f1a1484af747840c39325c67d7767d4 (diff) | |
| download | mariadb-git-09a2107b1b2f5567b8a50afec9e54a33284c6233.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/rpl_parallel.cc')
| -rw-r--r-- | sql/rpl_parallel.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/rpl_parallel.cc b/sql/rpl_parallel.cc index a814628e72c..ad734c23d48 100644 --- a/sql/rpl_parallel.cc +++ b/sql/rpl_parallel.cc @@ -1360,11 +1360,10 @@ handle_rpl_parallel_thread(void *arg) */ rpl_parallel_entry *e= rpt->current_entry; /* - Ensure that we will unblock rpl_pause_for_ftrwl() - e->pause_sub_id may be LONGLONG_MAX if rpt->current_entry has changed + Wait for rpl_unpause_after_ftwrl() to wake us up. + Note that rpl_pause_for_ftwrl() may wait for 'e->pause_sub_id' + to change. This should happen eventually in finish_event_group() */ - DBUG_ASSERT(e->pause_sub_id == (uint64)ULONGLONG_MAX || - e->last_committed_sub_id >= e->pause_sub_id); mysql_mutex_lock(&e->LOCK_parallel_entry); mysql_mutex_unlock(&rpt->LOCK_rpl_thread); if (rpt->pause_for_ftwrl) |