|
|
|
@ -653,7 +653,7 @@ SHOW_COMP_OPTION have_community_features; |
|
|
|
|
|
|
|
pthread_key(MEM_ROOT**,THR_MALLOC); |
|
|
|
pthread_key(THD*, THR_THD); |
|
|
|
pthread_mutex_t LOCK_mysql_create_db, LOCK_Acl, LOCK_open, LOCK_thread_count, |
|
|
|
pthread_mutex_t LOCK_mysql_create_db, LOCK_open, LOCK_thread_count, |
|
|
|
LOCK_mapped_file, LOCK_status, LOCK_global_read_lock, |
|
|
|
LOCK_error_log, LOCK_uuid_generator, |
|
|
|
LOCK_delayed_insert, LOCK_delayed_status, LOCK_delayed_create, |
|
|
|
@ -1422,7 +1422,6 @@ static void clean_up_mutexes() |
|
|
|
{ |
|
|
|
(void) pthread_mutex_destroy(&LOCK_mysql_create_db); |
|
|
|
(void) pthread_mutex_destroy(&LOCK_lock_db); |
|
|
|
(void) pthread_mutex_destroy(&LOCK_Acl); |
|
|
|
(void) rwlock_destroy(&LOCK_grant); |
|
|
|
(void) pthread_mutex_destroy(&LOCK_open); |
|
|
|
(void) pthread_mutex_destroy(&LOCK_thread_count); |
|
|
|
@ -3570,7 +3569,6 @@ static int init_thread_environment() |
|
|
|
{ |
|
|
|
(void) pthread_mutex_init(&LOCK_mysql_create_db,MY_MUTEX_INIT_SLOW); |
|
|
|
(void) pthread_mutex_init(&LOCK_lock_db,MY_MUTEX_INIT_SLOW); |
|
|
|
(void) pthread_mutex_init(&LOCK_Acl,MY_MUTEX_INIT_SLOW); |
|
|
|
(void) pthread_mutex_init(&LOCK_open, MY_MUTEX_INIT_FAST); |
|
|
|
(void) pthread_mutex_init(&LOCK_thread_count,MY_MUTEX_INIT_FAST); |
|
|
|
(void) pthread_mutex_init(&LOCK_mapped_file,MY_MUTEX_INIT_SLOW); |
|
|
|
|