diff options
| author | Eugene Kosov <claprix@yandex.ru> | 2020-04-07 13:14:41 +0300 |
|---|---|---|
| committer | Eugene Kosov <claprix@yandex.ru> | 2020-04-25 00:55:39 +0300 |
| commit | 2c5067b6890974d0df335a833ed7a4e4c6ced183 (patch) | |
| tree | 188a6cebe45fae4e2a4ddc701e400c9247519f5c /include | |
| parent | da7564edcf239fe7bc612efed97cc7b6fa89320b (diff) | |
| download | mariadb-git-2c5067b6890974d0df335a833ed7a4e4c6ced183.tar.gz | |
cleanup THR_KEY_mysys
read TLS with my_thread_var
write TLS with set_mysys_var()
my_thread_var is no longer __attribute__ ((const)): this attribute
is simply incorrect here. Read gcc manual for more information.
sql/threadpool_generic.cc fails with that attribute.
Diffstat (limited to 'include')
| -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 72647b6c9f7..f369b765edd 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -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 |