diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-03 16:43:03 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-03 16:43:03 +0300 |
| commit | c8555bdb35d998e99b6fb568f03c63479ff9272d (patch) | |
| tree | 3b69ab5126c40ef71ad69a5bb469de82c4be90a0 /mysys | |
| parent | 962d77de368e0cc90431e24d09e884f3760c7939 (diff) | |
| parent | 3d915225611a921fad03934e58bf281b48fc15b0 (diff) | |
| download | mariadb-git-c8555bdb35d998e99b6fb568f03c63479ff9272d.tar.gz | |
Merge next-mr -> next-4284
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_init.c | 5 | ||||
| -rw-r--r-- | mysys/my_thr_init.c | 4 | ||||
| -rw-r--r-- | mysys/mysys_priv.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index 8145dc6fb6a..31adc5ed99e 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -600,7 +600,7 @@ PSI_mutex_key key_BITMAP_mutex, key_IO_CACHE_append_buffer_lock, key_THR_LOCK_isam, 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, key_THR_LOCK_time, - key_TMPDIR_mutex; + key_TMPDIR_mutex, key_THR_LOCK_myisam_mmap; static PSI_mutex_info all_mysys_mutexes[]= { @@ -630,7 +630,8 @@ static PSI_mutex_info all_mysys_mutexes[]= { &key_THR_LOCK_open, "THR_LOCK_open", PSI_FLAG_GLOBAL}, { &key_THR_LOCK_threads, "THR_LOCK_threads", PSI_FLAG_GLOBAL}, { &key_THR_LOCK_time, "THR_LOCK_time", PSI_FLAG_GLOBAL}, - { &key_TMPDIR_mutex, "TMPDIR_mutex", PSI_FLAG_GLOBAL} + { &key_TMPDIR_mutex, "TMPDIR_mutex", PSI_FLAG_GLOBAL}, + { &key_THR_LOCK_myisam_mmap, "THR_LOCK_myisam_mmap", PSI_FLAG_GLOBAL} }; PSI_cond_key key_COND_alarm, key_IO_CACHE_SHARE_cond, diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c index a06bbb64c8b..83d35863eca 100644 --- a/mysys/my_thr_init.c +++ b/mysys/my_thr_init.c @@ -24,8 +24,8 @@ #ifdef THREAD pthread_key(struct st_my_thread_var*, THR_KEY_mysys); -mysql_mutex_t THR_LOCK_malloc,THR_LOCK_open, - THR_LOCK_lock,THR_LOCK_isam,THR_LOCK_myisam,THR_LOCK_heap, +mysql_mutex_t THR_LOCK_malloc, THR_LOCK_open, + THR_LOCK_lock, THR_LOCK_isam, THR_LOCK_myisam, THR_LOCK_heap, THR_LOCK_net, THR_LOCK_charset, THR_LOCK_threads, THR_LOCK_time, THR_LOCK_myisam_mmap; diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h index 3a663dfefbf..1f84d8d3aab 100644 --- a/mysys/mysys_priv.h +++ b/mysys/mysys_priv.h @@ -47,7 +47,7 @@ extern PSI_mutex_key key_BITMAP_mutex, key_IO_CACHE_append_buffer_lock, key_THR_LOCK_isam, 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, key_THR_LOCK_time, - key_TMPDIR_mutex; + key_TMPDIR_mutex, key_THR_LOCK_myisam_mmap; extern PSI_cond_key key_COND_alarm, key_IO_CACHE_SHARE_cond, key_IO_CACHE_SHARE_cond_writer, key_my_thread_var_suspend, |