summaryrefslogtreecommitdiff
path: root/sql/wsrep_applier.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/wsrep_applier.cc')
-rw-r--r--sql/wsrep_applier.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/wsrep_applier.cc b/sql/wsrep_applier.cc
index 23687e98c32..03d356aa046 100644
--- a/sql/wsrep_applier.cc
+++ b/sql/wsrep_applier.cc
@@ -95,7 +95,8 @@ static wsrep_cb_status_t wsrep_apply_events(THD* thd,
DBUG_ENTER("wsrep_apply_events");
- if (thd->killed == KILL_CONNECTION)
+ if (thd->killed == KILL_CONNECTION &&
+ thd->wsrep_conflict_state != REPLAYING)
{
WSREP_INFO("applier has been aborted, skipping apply_rbr: %lld",
(long long) wsrep_thd_trx_seqno(thd));