mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
Removed wrong patch. SELECT UUID() crashed the server due to
uninitialized mutex lock.
This commit is contained in:
parent
237315c076
commit
1b68e2ea36
1 changed files with 3 additions and 1 deletions
|
@ -566,7 +566,7 @@ 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,
|
||||
LOCK_mapped_file, LOCK_status, LOCK_global_read_lock,
|
||||
LOCK_error_log,
|
||||
LOCK_error_log, LOCK_uuid_generator,
|
||||
LOCK_delayed_insert, LOCK_delayed_status, LOCK_delayed_create,
|
||||
LOCK_crypt, LOCK_bytes_sent, LOCK_bytes_received,
|
||||
LOCK_global_system_variables,
|
||||
|
@ -1354,6 +1354,7 @@ static void clean_up_mutexes()
|
|||
(void) pthread_mutex_destroy(&LOCK_global_system_variables);
|
||||
(void) rwlock_destroy(&LOCK_system_variables_hash);
|
||||
(void) pthread_mutex_destroy(&LOCK_global_read_lock);
|
||||
(void) pthread_mutex_destroy(&LOCK_uuid_generator);
|
||||
(void) pthread_mutex_destroy(&LOCK_prepared_stmt_count);
|
||||
(void) pthread_cond_destroy(&COND_thread_count);
|
||||
(void) pthread_cond_destroy(&COND_refresh);
|
||||
|
@ -3104,6 +3105,7 @@ static int init_thread_environment()
|
|||
(void) my_rwlock_init(&LOCK_system_variables_hash, NULL);
|
||||
(void) pthread_mutex_init(&LOCK_global_read_lock, MY_MUTEX_INIT_FAST);
|
||||
(void) pthread_mutex_init(&LOCK_prepared_stmt_count, MY_MUTEX_INIT_FAST);
|
||||
(void) pthread_mutex_init(&LOCK_uuid_generator, MY_MUTEX_INIT_FAST);
|
||||
#ifdef HAVE_OPENSSL
|
||||
(void) pthread_mutex_init(&LOCK_des_key_file,MY_MUTEX_INIT_FAST);
|
||||
#ifndef HAVE_YASSL
|
||||
|
|
Loading…
Reference in a new issue