summaryrefslogtreecommitdiff
path: root/sql/wsrep_dummy.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2021-02-16 14:56:59 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2021-02-16 14:56:59 +0100
commite0072fadcb00edae74e748aee3148075b9cddae2 (patch)
tree625d5c0869cfbb322a2b4cdaab453e17fd5d31bf /sql/wsrep_dummy.cc
parent1146e98b3af3e2b15df0598a860f4571663a98d0 (diff)
parentae7989ca2059869f81c837509e5ff554f7f63562 (diff)
downloadmariadb-git-10.6-halfmerge.tar.gz
Merge branch 'bb-10.5-release' into bb-10.6-release10.6-halfmerge
Diffstat (limited to 'sql/wsrep_dummy.cc')
-rw-r--r--sql/wsrep_dummy.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/wsrep_dummy.cc b/sql/wsrep_dummy.cc
index 8ea9ca79697..5174b6e0b07 100644
--- a/sql/wsrep_dummy.cc
+++ b/sql/wsrep_dummy.cc
@@ -59,6 +59,12 @@ void wsrep_thd_LOCK(const THD *)
void wsrep_thd_UNLOCK(const THD *)
{ }
+void wsrep_thd_kill_LOCK(const THD *)
+{ }
+
+void wsrep_thd_kill_UNLOCK(const THD *)
+{ }
+
const char *wsrep_thd_conflict_state_str(THD *)
{ return 0; }