summaryrefslogtreecommitdiff
path: root/storage/innobase/handler/ha_innodb.cc
diff options
context:
space:
mode:
Diffstat (limited to 'storage/innobase/handler/ha_innodb.cc')
-rw-r--r--storage/innobase/handler/ha_innodb.cc10
1 files changed, 10 insertions, 0 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 708a5430c0c..fe1df40face 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -18778,6 +18778,16 @@ wsrep_kill_victim(
lock_cancel_waiting_and_release(wait_lock);
}
}
+ else
+ {
+ wsrep_thd_LOCK(thd);
+ victim_trx->lock.was_chosen_as_wsrep_victim= false;
+ wsrep_thd_set_wsrep_aborter(NULL, thd);
+ wsrep_thd_UNLOCK(thd);
+
+ WSREP_DEBUG("wsrep_thd_bf_abort has failed, victim %lu will survive",
+ thd_get_thread_id(thd));
+ }
DBUG_VOID_RETURN;
}