diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_atomic.h | 2 | ||||
| -rw-r--r-- | include/my_global.h | 4 | ||||
| -rw-r--r-- | include/my_service_manager.h | 2 | ||||
| -rw-r--r-- | include/mysql/service_wsrep.h | 3 | ||||
| -rw-r--r-- | include/service_versions.h | 2 | ||||
| -rw-r--r-- | include/wsrep.h | 5 |
6 files changed, 15 insertions, 3 deletions
diff --git a/include/my_atomic.h b/include/my_atomic.h index 8f13a0ab89b..2c797b5b9e8 100644 --- a/include/my_atomic.h +++ b/include/my_atomic.h @@ -359,7 +359,7 @@ make_atomic_store(ptr) #define MY_ATOMIC_NOT_1CPU 1 extern int my_atomic_initialize(); -#ifdef __ATOMIC_SEQ_CST +#ifdef HAVE_GCC_C11_ATOMICS #define MY_MEMORY_ORDER_RELAXED __ATOMIC_RELAXED #define MY_MEMORY_ORDER_CONSUME __ATOMIC_CONSUME #define MY_MEMORY_ORDER_ACQUIRE __ATOMIC_ACQUIRE diff --git a/include/my_global.h b/include/my_global.h index 65546a37700..8651956892c 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -255,7 +255,9 @@ AIX includes inttypes.h from sys/types.h Explicitly request format macros before the first inclusion of inttypes.h */ -#define __STDC_FORMAT_MACROS +#if !defined(__STDC_FORMAT_MACROS) +#define __STDC_FORMAT_MACROS +#endif // !defined(__STDC_FORMAT_MACROS) #endif diff --git a/include/my_service_manager.h b/include/my_service_manager.h index 4d88e992b5e..d9f41ace4d5 100644 --- a/include/my_service_manager.h +++ b/include/my_service_manager.h @@ -24,7 +24,9 @@ sd-daemon.h may include inttypes.h. Explicitly request format macros before the first inclusion of inttypes.h. */ +#if !defined(__STDC_FORMAT_MACROS) #define __STDC_FORMAT_MACROS +#endif // !defined(__STDC_FORMAT_MACROS) #include <systemd/sd-daemon.h> /** INTERVAL in seconds followed by printf style status */ #define service_manager_extend_timeout(INTERVAL, FMTSTR, ...) \ 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 582b3912355..753d6444475 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 diff --git a/include/wsrep.h b/include/wsrep.h index 0c06bb32b31..0d32547d69c 100644 --- a/include/wsrep.h +++ b/include/wsrep.h @@ -27,6 +27,11 @@ if (WSREP_ON && WSREP(thd) && wsrep_to_isolation_begin(thd, db_, table_, table_list_)) \ goto error; +#define WSREP_TO_ISOLATION_BEGIN_ALTER(db_, table_, table_list_, alter_info_) \ + if (WSREP_ON && WSREP(thd) && wsrep_to_isolation_begin(thd, db_, table_, \ + table_list_, alter_info_)) \ + goto error; + #define WSREP_TO_ISOLATION_END \ if (WSREP_ON && (WSREP(thd) || (thd && thd->wsrep_exec_mode==TOTAL_ORDER))) \ wsrep_to_isolation_end(thd); |