diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-22 10:32:33 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-22 10:32:33 +0100 |
| commit | 7697bf0bd7e5b50c1071742ac90539be71f6eabe (patch) | |
| tree | 9c4f650d6961467da0bbda23e3697571c984832d /include | |
| parent | 0686c34d22a5cbf93015012eaf77a4a977b63afb (diff) | |
| parent | 080da551ea171f8a43633ab27b56875938643dd0 (diff) | |
| download | mariadb-git-7697bf0bd7e5b50c1071742ac90539be71f6eabe.tar.gz | |
Merge branch 'github/10.0-galera' into 10.1
Note: some tests fail, just as they failed before the merge!
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 93567c1927d..6b332f89958 100644 --- a/include/mysql/service_wsrep.h +++ b/include/mysql/service_wsrep.h @@ -104,6 +104,7 @@ extern struct wsrep_service_st { const char * (*wsrep_thd_query_state_str_func)(THD *thd); int (*wsrep_thd_retry_counter_func)(THD *thd); void (*wsrep_thd_set_conflict_state_func)(THD *thd, enum wsrep_conflict_state state); + bool (*wsrep_thd_skip_append_keys_func)(THD *thd); long long (*wsrep_thd_trx_seqno_func)(THD *thd); struct wsrep_ws_handle * (*wsrep_thd_ws_handle_func)(THD *thd); int (*wsrep_trx_is_aborting_func)(MYSQL_THD thd); @@ -144,6 +145,7 @@ extern struct wsrep_service_st { #define wsrep_thd_query_state_str(T) wsrep_service->wsrep_thd_query_state_str_func(T) #define wsrep_thd_retry_counter(T) wsrep_service->wsrep_thd_retry_counter_func(T) #define wsrep_thd_set_conflict_state(T,S) wsrep_service->wsrep_thd_set_conflict_state_func(T,S) +#define wsrep_thd_skip_append_keys(T) wsrep_service->wsrep_thd_skip_append_keys_func(T) #define wsrep_thd_trx_seqno(T) wsrep_service->wsrep_thd_trx_seqno_func(T) #define wsrep_thd_ws_handle(T) wsrep_service->wsrep_thd_ws_handle_func(T) #define wsrep_trx_is_aborting(T) wsrep_service->wsrep_trx_is_aborting_func(T) @@ -204,6 +206,7 @@ void wsrep_thd_LOCK(THD *thd); void wsrep_thd_UNLOCK(THD *thd); 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_skip_append_keys(THD *thd); void wsrep_unlock_rollback(); #endif diff --git a/include/service_versions.h b/include/service_versions.h index 58d5f41c4a3..0f0990d43b3 100644 --- a/include/service_versions.h +++ b/include/service_versions.h @@ -30,7 +30,7 @@ #define VERSION_thd_timezone 0x0100 #define VERSION_my_sha1 0x0101 #define VERSION_my_md5 0x0100 -#define VERSION_wsrep 0x0200 +#define VERSION_wsrep 0x0201 #define VERSION_logger 0x0100 #define VERSION_thd_autoinc 0x0100 #define VERSION_thd_error_context 0x0100 |