diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-27 17:38:17 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-27 17:38:17 +0300 |
| commit | b63446984c2c8441c19fc646f6652a9bc3076304 (patch) | |
| tree | a874d841721ba5d80f66e92e5e16dc0ab4233e2a /include/my_pthread.h | |
| parent | 6dab094fbd31ef93a1d51b1b9c867188b2f958c3 (diff) | |
| parent | 3568fad5c935426a275900e8130657b18ba14e9f (diff) | |
| download | mariadb-git-b63446984c2c8441c19fc646f6652a9bc3076304.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'include/my_pthread.h')
| -rw-r--r-- | include/my_pthread.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 3f56f7dd058..81dd63ee331 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -739,13 +739,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 |