diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-27 17:10:39 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-27 17:10:39 +0300 |
commit | dad7a8ee7dab99c0ba3d98ac12d0235462f3029e (patch) | |
tree | bdfa61bfebb73cf1c5c06a1e3931dd7d2d4b0d77 /sql/rpl_parallel.cc | |
parent | 7476e8c7cdd73d60294126a2840baee97e7644b6 (diff) | |
parent | 5139cfabb3bfc62be38e651ff176580e0aba09b8 (diff) | |
download | mariadb-git-dad7a8ee7dab99c0ba3d98ac12d0235462f3029e.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/rpl_parallel.cc')
-rw-r--r-- | sql/rpl_parallel.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/rpl_parallel.cc b/sql/rpl_parallel.cc index 90126448c30..7ba081f2613 100644 --- a/sql/rpl_parallel.cc +++ b/sql/rpl_parallel.cc @@ -75,18 +75,18 @@ handle_queued_pos_update(THD *thd, rpl_parallel_thread::queued_event *qev) /* Do not update position if an earlier event group caused an error abort. */ DBUG_ASSERT(qev->typ == rpl_parallel_thread::queued_event::QUEUED_POS_UPDATE); + rli= qev->rgi->rli; e= qev->entry_for_queued; - if (e->stop_on_error_sub_id < (uint64)ULONGLONG_MAX || e->force_abort) + if (e->stop_on_error_sub_id < (uint64)ULONGLONG_MAX || + (e->force_abort && !rli->stop_for_until)) return; - rli= qev->rgi->rli; mysql_mutex_lock(&rli->data_lock); cmp= strcmp(rli->group_relay_log_name, qev->event_relay_log_name); if (cmp < 0) { rli->group_relay_log_pos= qev->future_event_relay_log_pos; strmake_buf(rli->group_relay_log_name, qev->event_relay_log_name); - rli->notify_group_relay_log_name_update(); } else if (cmp == 0 && rli->group_relay_log_pos < qev->future_event_relay_log_pos) rli->group_relay_log_pos= qev->future_event_relay_log_pos; |