summaryrefslogtreecommitdiff
path: root/sql/wsrep_dummy.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-09-21 11:04:04 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-09-21 11:04:04 +0300
commitcbcb4ecabbb82a09794d825ca246d64e3d4b2c8c (patch)
treeb8fab11441c9080cbd3574a26c3eee10df58aaed /sql/wsrep_dummy.cc
parentade782c001affa69df80ed51e807e16198a9fe04 (diff)
parent69d536a22dc1988e89697c55549fc3c272fbbf2c (diff)
downloadmariadb-git-cbcb4ecabbb82a09794d825ca246d64e3d4b2c8c.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'sql/wsrep_dummy.cc')
-rw-r--r--sql/wsrep_dummy.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/wsrep_dummy.cc b/sql/wsrep_dummy.cc
index 1af74035355..2f12b089939 100644
--- a/sql/wsrep_dummy.cc
+++ b/sql/wsrep_dummy.cc
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 SkySQL Ab.
+/* Copyright (C) 2014, 2020, MariaDB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -163,3 +163,7 @@ void wsrep_log(void (*)(const char *, ...), const char *, ...)
my_bool wsrep_thd_is_applier(MYSQL_THD thd)
{ return false; }
+
+void wsrep_report_bf_lock_wait(MYSQL_THD thd,
+ unsigned long long id)
+{}