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.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2020-04-27 14:24:41 +03:00
parent 61c0df9465 c06845d6f0
commit 2e12d471ea
30 changed files with 165 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/my_pthread.h
View File

@@ -729,13 +729,14 @@ struct st_my_thread_var
#endif
};
extern struct st_my_thread_var *_my_thread_var(void) __attribute__ ((const));
struct st_my_thread_var *_my_thread_var(void);
extern void **my_thread_var_dbug(void);
extern safe_mutex_t **my_thread_var_mutex_in_use(void);
extern uint my_thread_end_wait_time;
extern my_bool safe_mutex_deadlock_detector;
#define my_thread_var (_my_thread_var())
#define my_errno my_thread_var->thr_errno
int set_mysys_var(struct st_my_thread_var *mysys_var);
/*
Keep track of shutdown,signal, and main threads so that my_end() will not
report errors with them