diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-09-30 18:06:15 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-09-30 18:06:15 -0400 |
| commit | 9a57de86beda0032a6dd9f804822e2651eb869bf (patch) | |
| tree | 7c1b645c0f4e4392c3c47da46f4c5d08b0c28a86 /sql/wsrep_applier.cc | |
| parent | c916085e271cd049537b1e07b36cd060c44750bd (diff) | |
| download | mariadb-git-9a57de86beda0032a6dd9f804822e2651eb869bf.tar.gz | |
bzr merge -r4123..4144 codership/5.6
Diffstat (limited to 'sql/wsrep_applier.cc')
| -rw-r--r-- | sql/wsrep_applier.cc | 3 |
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)); |