diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-17 22:16:54 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-17 22:16:54 +0300 |
| commit | 0e3a80e0a851822112226e5e792320389aa0f2ae (patch) | |
| tree | ff7694d43f6a555d626904a5e76d66755c22f43d /mysys/my_thr_init.c | |
| parent | cc85fe239dd14088b2f326f263765612b03e8f61 (diff) | |
| parent | 53da51de9d8fc607063e131cc32361f39d95ac2d (diff) | |
| download | mariadb-git-0e3a80e0a851822112226e5e792320389aa0f2ae.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- storage/myisam/mi_packrec.c
Diffstat (limited to 'mysys/my_thr_init.c')
| -rw-r--r-- | mysys/my_thr_init.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c index ba59c483012..f763e6c0c54 100644 --- a/mysys/my_thr_init.c +++ b/mysys/my_thr_init.c @@ -26,7 +26,9 @@ pthread_key(struct st_my_thread_var*, THR_KEY_mysys); pthread_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_net, THR_LOCK_charset, THR_LOCK_threads, THR_LOCK_time, + THR_LOCK_myisam_mmap; + pthread_cond_t THR_COND_threads; uint THR_thread_count= 0; uint my_thread_end_wait_time= 5; @@ -142,6 +144,7 @@ my_bool my_thread_global_init(void) pthread_mutex_init(&THR_LOCK_lock,MY_MUTEX_INIT_FAST); pthread_mutex_init(&THR_LOCK_isam,MY_MUTEX_INIT_SLOW); pthread_mutex_init(&THR_LOCK_myisam,MY_MUTEX_INIT_SLOW); + pthread_mutex_init(&THR_LOCK_myisam_mmap,MY_MUTEX_INIT_FAST); pthread_mutex_init(&THR_LOCK_heap,MY_MUTEX_INIT_FAST); pthread_mutex_init(&THR_LOCK_net,MY_MUTEX_INIT_FAST); pthread_mutex_init(&THR_LOCK_charset,MY_MUTEX_INIT_FAST); @@ -211,6 +214,7 @@ void my_thread_global_end(void) pthread_mutex_destroy(&THR_LOCK_lock); pthread_mutex_destroy(&THR_LOCK_isam); pthread_mutex_destroy(&THR_LOCK_myisam); + pthread_mutex_destroy(&THR_LOCK_myisam_mmap); pthread_mutex_destroy(&THR_LOCK_heap); pthread_mutex_destroy(&THR_LOCK_net); pthread_mutex_destroy(&THR_LOCK_time); |