database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fix InnoDB dynamic plugin compile errors on wsrep patch.

Browse Source
This commit is contained in:
Jan Lindström
2019-04-10 11:19:38 +03:00
parent 304ae942f7
commit 71848585f8
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/mysql/service_wsrep.h
View File

@@ -83,6 +83,7 @@ extern struct wsrep_service_st {
const char* (*wsrep_get_sr_table_name_func)(); const char* (*wsrep_get_sr_table_name_func)();
my_bool (*wsrep_get_debug_func)(); my_bool (*wsrep_get_debug_func)();
void (*wsrep_commit_ordered_func)(MYSQL_THD thd); void (*wsrep_commit_ordered_func)(MYSQL_THD thd);
my_bool (*wsrep_thd_is_applying_func)(const MYSQL_THD thd);
} *wsrep_service; } *wsrep_service;
#define MYSQL_SERVICE_WSREP_INCLUDED #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_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_sr_table_name() wsrep_service->wsrep_get_sr_table_name_func()
#define wsrep_get_debug() wsrep_service->wsrep_get_debug_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 #else
@@ -213,6 +215,7 @@ extern "C" const char* wsrep_get_sr_table_name();
extern "C" my_bool wsrep_get_debug(); extern "C" my_bool wsrep_get_debug();
extern "C" void wsrep_commit_ordered(MYSQL_THD thd); extern "C" void wsrep_commit_ordered(MYSQL_THD thd);
extern "C" my_bool wsrep_thd_is_applying(const MYSQL_THD thd);
#endif #endif
#endif /* MYSQL_SERVICE_WSREP_INCLUDED */ #endif /* MYSQL_SERVICE_WSREP_INCLUDED */

3
sql/sql_plugin_services.ic
View File

@@ -172,7 +172,8 @@ static struct wsrep_service_st wsrep_handler = {
wsrep_thd_skip_locking, wsrep_thd_skip_locking,
wsrep_get_sr_table_name, wsrep_get_sr_table_name,
wsrep_get_debug, wsrep_get_debug,
wsrep_commit_ordered wsrep_commit_ordered,
wsrep_thd_is_applying
}; };
static struct thd_specifics_service_st thd_specifics_handler= static struct thd_specifics_service_st thd_specifics_handler=

3
sql/wsrep_dummy.cc
View File

@@ -135,3 +135,6 @@ my_bool wsrep_get_debug()
void wsrep_commit_ordered(THD* ) void wsrep_commit_ordered(THD* )
{ } { }
my_bool wsrep_thd_is_applying(const THD*)
{ return 0;}