summaryrefslogtreecommitdiff
path: root/sql/service_wsrep.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-09-23 11:32:43 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-09-23 11:32:43 +0300
commit882ce206dbf06b771ffe4cbce2e3e4214982f302 (patch)
tree63b3d1314bf9ab4d8c7fe314818c6349c127f877 /sql/service_wsrep.cc
parent6ab6b1510ed0851bda335a8919047c02860fe2e8 (diff)
parentd7c82610c14f5102258640c73c1d78ea22f942c3 (diff)
downloadmariadb-git-882ce206dbf06b771ffe4cbce2e3e4214982f302.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'sql/service_wsrep.cc')
-rw-r--r--sql/service_wsrep.cc25
1 files changed, 24 insertions, 1 deletions
diff --git a/sql/service_wsrep.cc b/sql/service_wsrep.cc
index f61db1e80e8..e7eee5f67a5 100644
--- a/sql/service_wsrep.cc
+++ b/sql/service_wsrep.cc
@@ -372,4 +372,27 @@ extern "C" bool wsrep_thd_set_wsrep_aborter(THD *bf_thd, THD *victim_thd)
}
victim_thd->wsrep_aborter = bf_thd->thread_id;
return false;
-} \ No newline at end of file
+}
+
+extern "C" void wsrep_report_bf_lock_wait(const THD *thd,
+ unsigned long long trx_id)
+{
+ if (thd)
+ {
+ WSREP_ERROR("Thread %s trx_id: %llu thread: %ld "
+ "seqno: %lld client_state: %s client_mode: %s transaction_mode: %s "
+ "applier: %d toi: %d local: %d "
+ "query: %s",
+ wsrep_thd_is_BF(thd, false) ? "BF" : "normal",
+ trx_id,
+ thd_get_thread_id(thd),
+ wsrep_thd_trx_seqno(thd),
+ wsrep_thd_client_state_str(thd),
+ wsrep_thd_client_mode_str(thd),
+ wsrep_thd_transaction_state_str(thd),
+ wsrep_thd_is_applying(thd),
+ wsrep_thd_is_toi(thd),
+ wsrep_thd_is_local(thd),
+ wsrep_thd_query(thd));
+ }
+}