diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-10-09 18:28:14 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-10-09 18:28:14 -0400 |
| commit | 542968cf0a68070d7b45859a3148a602e2089a35 (patch) | |
| tree | 889399fd2c19496137b61cb7e9131d371763ee09 /sql/wsrep_applier.cc | |
| parent | 068fb8569f2300e4a5c08413a756417d923ecf5f (diff) | |
| download | mariadb-git-542968cf0a68070d7b45859a3148a602e2089a35.tar.gz | |
bzr merge -r4015..4026 codership/5.5
Diffstat (limited to 'sql/wsrep_applier.cc')
| -rw-r--r-- | sql/wsrep_applier.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/wsrep_applier.cc b/sql/wsrep_applier.cc index 6701d3fd28a..cb700448ee5 100644 --- a/sql/wsrep_applier.cc +++ b/sql/wsrep_applier.cc @@ -74,9 +74,10 @@ static wsrep_cb_status_t wsrep_apply_events(THD* thd, int rcode= 0; int event= 1; - DBUG_ENTER("wsrep_apply_rbr"); + 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)); |