[Commits] 71848585f81: Fix InnoDB dynamic plugin compile errors on wsrep patch.

jan jan.lindstrom at mariadb.com
Wed Apr 10 11:20:35 EEST 2019


revision-id: 71848585f81690babb70cba345719a5d178b00d7 (mariadb-10.4.4-6-g71848585f81)
parent(s): 304ae942f78f231a1f382624cdef9be80b3f5b84
author: Jan Lindström
committer: Jan Lindström
timestamp: 2019-04-10 11:19:38 +0300
message:

Fix InnoDB dynamic plugin compile errors on wsrep patch.

---
 include/mysql/service_wsrep.h | 5 ++++-
 sql/sql_plugin_services.ic    | 3 ++-
 sql/wsrep_dummy.cc            | 3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/include/mysql/service_wsrep.h b/include/mysql/service_wsrep.h
index 8424689a219..d76643364b3 100644
--- a/include/mysql/service_wsrep.h
+++ b/include/mysql/service_wsrep.h
@@ -83,6 +83,7 @@ extern struct wsrep_service_st {
   const char*                 (*wsrep_get_sr_table_name_func)();
   my_bool                     (*wsrep_get_debug_func)();
   void                        (*wsrep_commit_ordered_func)(MYSQL_THD thd);
+  my_bool                     (*wsrep_thd_is_applying_func)(const MYSQL_THD thd);
 } *wsrep_service;
 
 #define MYSQL_SERVICE_WSREP_INCLUDED
@@ -121,7 +122,8 @@ extern struct wsrep_service_st {
 #define wsrep_thd_skip_locking(T) wsrep_service->wsrep_thd_skip_locking_func(T)
 #define wsrep_get_sr_table_name() wsrep_service->wsrep_get_sr_table_name_func()
 #define wsrep_get_debug() wsrep_service->wsrep_get_debug_func()
-#define wsrep_commit_ordered(T) wsrep_service->wsrep_commit_ordered(T)
+#define wsrep_commit_ordered(T) wsrep_service->wsrep_commit_ordered_func(T)
+#define wsrep_thd_is_applying(T) wsrep_service->wsrep_thd_is_applying_func(T)
 
 #else
 
@@ -213,6 +215,7 @@ extern "C" const char* wsrep_get_sr_table_name();
 extern "C" my_bool wsrep_get_debug();
 
 extern "C" void wsrep_commit_ordered(MYSQL_THD thd);
+extern "C" my_bool wsrep_thd_is_applying(const MYSQL_THD thd);
 
 #endif
 #endif /* MYSQL_SERVICE_WSREP_INCLUDED */
diff --git a/sql/sql_plugin_services.ic b/sql/sql_plugin_services.ic
index 36748121360..955b9a0ce3a 100644
--- a/sql/sql_plugin_services.ic
+++ b/sql/sql_plugin_services.ic
@@ -172,7 +172,8 @@ static struct wsrep_service_st wsrep_handler = {
   wsrep_thd_skip_locking,
   wsrep_get_sr_table_name,
   wsrep_get_debug,
-  wsrep_commit_ordered
+  wsrep_commit_ordered,
+  wsrep_thd_is_applying
 };
 
 static struct thd_specifics_service_st thd_specifics_handler=
diff --git a/sql/wsrep_dummy.cc b/sql/wsrep_dummy.cc
index bd37042992a..01f2ad88ed5 100644
--- a/sql/wsrep_dummy.cc
+++ b/sql/wsrep_dummy.cc
@@ -135,3 +135,6 @@ my_bool wsrep_get_debug()
 
 void wsrep_commit_ordered(THD* )
 { }
+
+my_bool wsrep_thd_is_applying(const THD*)
+{ return 0;}


More information about the commits mailing list