diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-17 13:06:41 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-17 13:06:41 +0100 |
| commit | b64fde8f38515dc39e019de26db7624cc0ea7046 (patch) | |
| tree | 0478ea4c3ddeee290f6d381a47efa4f9aded9c0b /include | |
| parent | a89ee3cd154a67df2231f034fd8339f9225dbe64 (diff) | |
| parent | 1f020299f816263e347c852eb2a494b5ef1cbf0d (diff) | |
| download | mariadb-git-b64fde8f38515dc39e019de26db7624cc0ea7046.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql/service_wsrep.h | 4 | ||||
| -rw-r--r-- | include/thread_pool_priv.h | 2 | ||||
| -rw-r--r-- | include/wsrep.h | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/mysql/service_wsrep.h b/include/mysql/service_wsrep.h index 461b1064633..934a43fa55b 100644 --- a/include/mysql/service_wsrep.h +++ b/include/mysql/service_wsrep.h @@ -114,6 +114,7 @@ extern struct wsrep_service_st { 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); + my_bool (*wsrep_thd_is_applier_func)(MYSQL_THD); } *wsrep_service; #ifdef MYSQL_DYNAMIC_PLUGIN @@ -159,6 +160,7 @@ extern struct wsrep_service_st { #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_thd_is_applier(T) wsrep_service->wsrep_thd_is_applier(T) #define wsrep_debug get_wsrep_debug() #define wsrep_log_conflicts get_wsrep_log_conflicts() @@ -220,7 +222,7 @@ 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); - +my_bool wsrep_thd_is_applier(MYSQL_THD thd); #endif #ifdef __cplusplus diff --git a/include/thread_pool_priv.h b/include/thread_pool_priv.h index f5fdbfbdf47..ef3cd6f269c 100644 --- a/include/thread_pool_priv.h +++ b/include/thread_pool_priv.h @@ -97,8 +97,6 @@ void mysql_audit_release(THD *thd); bool thd_is_connection_alive(THD *thd); /* Close connection with possible error code */ void close_connection(THD *thd, uint errcode); -/* End the connection before closing it */ -void end_connection(THD *thd); /* Decrement connection counter */ void dec_connection_count(); /* Destroy THD object */ diff --git a/include/wsrep.h b/include/wsrep.h index 843b9c51198..dc85670d60e 100644 --- a/include/wsrep.h +++ b/include/wsrep.h @@ -50,9 +50,9 @@ #define WSREP_WARN(...) WSREP_LOG(sql_print_warning, ##__VA_ARGS__) #define WSREP_ERROR(...) WSREP_LOG(sql_print_error, ##__VA_ARGS__) -#define WSREP_SYNC_WAIT(thd_, before_) \ - { if (WSREP_CLIENT(thd_) && \ - wsrep_sync_wait(thd_, before_)) goto wsrep_error_label; } +#define WSREP_SYNC_WAIT(thd_, before_) \ + do { if (WSREP_CLIENT(thd_) && \ + wsrep_sync_wait(thd_, before_)) goto wsrep_error_label; } while(0) #define WSREP_ERROR_LABEL wsrep_error_label #else #define IF_WSREP(A,B) B @@ -65,7 +65,7 @@ #define WSREP_TO_ISOLATION_BEGIN_ALTER(db_, table_, table_list_, alter_info_) #define WSREP_TO_ISOLATION_END #define WSREP_TO_ISOLATION_BEGIN_WRTCHK(db_, table_, table_list_) -#define WSREP_SYNC_WAIT(thd_, before_) +#define WSREP_SYNC_WAIT(thd_, before_) do { } while(0) #define WSREP_ERROR_LABEL goto wsrep_error_label; wsrep_error_label #endif /* WITH_WSREP */ |