diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-09-03 10:27:36 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-09-04 09:19:50 +0200 |
| commit | a6246cab1693b91a04bdb2ff66710fc62ab1b6e7 (patch) | |
| tree | 43d652558b7d229e4f6323370e8b1d9471011200 /include | |
| parent | c27275474040ba7f91868dcb1ab79306418268d2 (diff) | |
| download | mariadb-git-a6246cab1693b91a04bdb2ff66710fc62ab1b6e7.tar.gz | |
fix failures of innodb_plugin tests in --embedded
Post-fix for 7e8ed15b95b
Also, apply the same innodb fix to xtradb.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql/service_wsrep.h | 3 | ||||
| -rw-r--r-- | include/service_versions.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/mysql/service_wsrep.h b/include/mysql/service_wsrep.h index bc5b2c67cdc..b51f154422f 100644 --- a/include/mysql/service_wsrep.h +++ b/include/mysql/service_wsrep.h @@ -110,6 +110,7 @@ extern struct wsrep_service_st { int (*wsrep_trx_is_aborting_func)(MYSQL_THD thd); int (*wsrep_trx_order_before_func)(MYSQL_THD, MYSQL_THD); void (*wsrep_unlock_rollback_func)(); + void (*wsrep_set_data_home_dir_func)(const char *data_dir); } *wsrep_service; #ifdef MYSQL_DYNAMIC_PLUGIN @@ -151,6 +152,7 @@ extern struct wsrep_service_st { #define wsrep_trx_is_aborting(T) wsrep_service->wsrep_trx_is_aborting_func(T) #define wsrep_trx_order_before(T1,T2) wsrep_service->wsrep_trx_order_before_func(T1,T2) #define wsrep_unlock_rollback() wsrep_service->wsrep_unlock_rollback_func() +#define wsrep_set_data_home_dir(A) wsrep_service->wsrep_set_data_home_dir_func(A) #define wsrep_debug get_wsrep_debug() #define wsrep_log_conflicts get_wsrep_log_conflicts() @@ -208,6 +210,7 @@ void wsrep_thd_awake(THD *thd, my_bool signal); void wsrep_thd_set_conflict_state(THD *thd, enum wsrep_conflict_state state); bool wsrep_thd_ignore_table(THD *thd); void wsrep_unlock_rollback(); +void wsrep_set_data_home_dir(const char *data_dir); #endif diff --git a/include/service_versions.h b/include/service_versions.h index da7a2101f76..3bbf2a9a625 100644 --- a/include/service_versions.h +++ b/include/service_versions.h @@ -41,4 +41,4 @@ #define VERSION_thd_specifics 0x0100 #define VERSION_thd_timezone 0x0100 #define VERSION_thd_wait 0x0100 -#define VERSION_wsrep 0x0201 +#define VERSION_wsrep 0x0202 |