diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2018-06-05 12:54:06 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2018-06-05 18:10:42 +0400 |
| commit | 3407dba7adc8dfb6fd26f11e72f894ab33a55c1c (patch) | |
| tree | 37b80e88cacf65aaf5ded2e31e48c7e3f00b208b /mysys/my_init.c | |
| parent | c5b3a2754f3db6fd0b3054a2e83420378c8d2a0c (diff) | |
| download | mariadb-git-bb-10.3-svoj.tar.gz | |
MDEV-16371 - Fix for memory write order inversionbb-10.3-svoj
my_atomic implementation for interruptable waits.
Diffstat (limited to 'mysys/my_init.c')
| -rw-r--r-- | mysys/my_init.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index 972750da0ff..11047ef45d1 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -479,7 +479,7 @@ PSI_mutex_key key_LOCK_localtime_r; PSI_mutex_key key_BITMAP_mutex, key_IO_CACHE_append_buffer_lock, key_IO_CACHE_SHARE_mutex, key_KEY_CACHE_cache_lock, key_LOCK_alarm, key_LOCK_timer, - key_my_thread_var_mutex, key_THR_LOCK_charset, key_THR_LOCK_heap, + key_THR_LOCK_charset, key_THR_LOCK_heap, key_THR_LOCK_lock, key_THR_LOCK_malloc, key_THR_LOCK_mutex, key_THR_LOCK_myisam, key_THR_LOCK_net, key_THR_LOCK_open, key_THR_LOCK_threads, @@ -499,7 +499,6 @@ static PSI_mutex_info all_mysys_mutexes[]= { &key_KEY_CACHE_cache_lock, "KEY_CACHE::cache_lock", 0}, { &key_LOCK_alarm, "LOCK_alarm", PSI_FLAG_GLOBAL}, { &key_LOCK_timer, "LOCK_timer", PSI_FLAG_GLOBAL}, - { &key_my_thread_var_mutex, "my_thread_var::mutex", 0}, { &key_THR_LOCK_charset, "THR_LOCK_charset", PSI_FLAG_GLOBAL}, { &key_THR_LOCK_heap, "THR_LOCK_heap", PSI_FLAG_GLOBAL}, { &key_THR_LOCK_lock, "THR_LOCK_lock", PSI_FLAG_GLOBAL}, |