database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source 
The functional changes of commit 5836191c8f
(MDEV-21168) are omitted due to MDEV-742 having addressed the issue.
This commit is contained in:
Marko Mäkelä
2020-04-25 21:57:52 +03:00
parent 62903434eb a19782522b
commit fbe2712705
202 changed files with 2911 additions and 1669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/my_pthread.h
View File

@@ -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
*/