diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-06-23 16:46:12 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-06-23 16:46:12 -0400 |
| commit | 70714d3597ec9ffa742cc9e173d4ad32f294cc51 (patch) | |
| tree | cff4572a50b569fbeefc2e5682916e917de7552d /sql/wsrep_thd.cc | |
| parent | 46024098be1d7887134a3a3d8d289dd7711c56dc (diff) | |
| parent | 71d1f35847a575239deff856590bf6f13afd74ed (diff) | |
| download | mariadb-git-70714d3597ec9ffa742cc9e173d4ad32f294cc51.tar.gz | |
Merge branch '5.5-galera' into 10.0-galera
Diffstat (limited to 'sql/wsrep_thd.cc')
| -rw-r--r-- | sql/wsrep_thd.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sql/wsrep_thd.cc b/sql/wsrep_thd.cc index a65e0fe731d..2b251ef5d58 100644 --- a/sql/wsrep_thd.cc +++ b/sql/wsrep_thd.cc @@ -579,6 +579,17 @@ int wsrep_abort_thd(void *bf_thd_ptr, void *victim_thd_ptr, my_bool signal) bf_thd->wsrep_exec_mode == TOTAL_ORDER) ) && victim_thd) { + if ((victim_thd->wsrep_conflict_state == MUST_ABORT) || + (victim_thd->wsrep_conflict_state == ABORTED) || + (victim_thd->wsrep_conflict_state == ABORTING)) + { + WSREP_DEBUG("wsrep_abort_thd called by %llu with victim %llu already " + "aborted. Ignoring.", + (bf_thd) ? (long long)bf_thd->real_id : 0, + (long long)victim_thd->real_id); + DBUG_RETURN(1); + } + WSREP_DEBUG("wsrep_abort_thd, by: %llu, victim: %llu", (bf_thd) ? (long long)bf_thd->real_id : 0, (long long)victim_thd->real_id); ha_wsrep_abort_transaction(bf_thd, victim_thd, signal); |