diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-25 21:57:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-25 21:57:52 +0300 |
| commit | fbe2712705d464bf8488df249c36115e2c1f63f7 (patch) | |
| tree | 274e728c719611769288afcb10f79549f6e11f8c /include | |
| parent | 62903434eb009cb0bcd5003b0a45914bd4c09886 (diff) | |
| parent | a19782522b1eac52d72f5e787b5d96f1fd1a2cb7 (diff) | |
| download | mariadb-git-fbe2712705d464bf8488df249c36115e2c1f63f7.tar.gz | |
Merge 10.4 into 10.5
The functional changes of commit 5836191c8f0658d5d75484766fdcc3d838b0a5c1
(MDEV-21168) are omitted due to MDEV-742 having addressed the issue.
Diffstat (limited to 'include')
| -rw-r--r-- | include/lf.h | 1 | ||||
| -rw-r--r-- | include/my_pthread.h | 22 | ||||
| -rw-r--r-- | include/mysql/service_wsrep.h | 4 |
3 files changed, 2 insertions, 25 deletions
diff --git a/include/lf.h b/include/lf.h index 933eb4938f8..88ac644c349 100644 --- a/include/lf.h +++ b/include/lf.h @@ -17,7 +17,6 @@ #define INCLUDE_LF_INCLUDED #include <my_atomic.h> -#include <my_cpu.h> C_MODE_START diff --git a/include/my_pthread.h b/include/my_pthread.h index 175731a7b0b..8bdf02a1bac 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -23,8 +23,6 @@ #define ETIME ETIMEDOUT /* For FreeBSD */ #endif -#include <my_atomic.h> - #ifdef __cplusplus #define EXTERNC extern "C" extern "C" { @@ -797,26 +795,6 @@ extern my_bool safe_mutex_deadlock_detector; #define statistic_sub(V,C,L) (V)-=(C) #endif /* SAFE_STATISTICS */ -static inline void thread_safe_increment32(int32 *value) -{ - (void) my_atomic_add32_explicit(value, 1, MY_MEMORY_ORDER_RELAXED); -} - -static inline void thread_safe_decrement32(int32 *value) -{ - (void) my_atomic_add32_explicit(value, -1, MY_MEMORY_ORDER_RELAXED); -} - -static inline void thread_safe_increment64(int64 *value) -{ - (void) my_atomic_add64_explicit(value, 1, MY_MEMORY_ORDER_RELAXED); -} - -static inline void thread_safe_decrement64(int64 *value) -{ - (void) my_atomic_add64_explicit(value, -1, MY_MEMORY_ORDER_RELAXED); -} - /* No locking needed, the counter is owned by the thread */ diff --git a/include/mysql/service_wsrep.h b/include/mysql/service_wsrep.h index 8d132212d77..5ffa476fdfb 100644 --- a/include/mysql/service_wsrep.h +++ b/include/mysql/service_wsrep.h @@ -13,7 +13,7 @@ enum Wsrep_service_key_type #else -/* Copyright (c) 2015 MariaDB Corporation Ab +/* Copyright (c) 2015, 2020, MariaDB Corporation Ab 2018 Codership Oy <info@codership.com> This program is free software; you can redistribute it and/or modify @@ -100,7 +100,7 @@ extern struct wsrep_service_st { #define wsrep_is_wsrep_xid(X) wsrep_service->wsrep_is_wsrep_xid_func(X) #define wsrep_xid_seqno(X) wsrep_service->wsrep_xid_seqno_func(X) #define wsrep_xid_uuid(X) wsrep_service->wsrep_xid_uuid_func(X) -#define wsrep_on(X) wsrep_service->wsrep_on_func(X) +#define wsrep_on(thd) (thd) && WSREP_ON && wsrep_service->wsrep_on_func(thd) #define wsrep_prepare_key_for_innodb(A,B,C,D,E,F,G) wsrep_service->wsrep_prepare_key_for_innodb_func(A,B,C,D,E,F,G) #define wsrep_thd_LOCK(T) wsrep_service->wsrep_thd_LOCK_func(T) #define wsrep_thd_UNLOCK(T) wsrep_service->wsrep_thd_UNLOCK_func(T) |