From 389dcccbed58122bb41dd0ad29aab69178592266 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 18 Dec 2007 23:55:49 +0200 Subject: - Clean up function for my_uuid() - Merge fixes - "make test" for maria - Replaced ma_test_all with a perl version, which now can be run in unittest mode. include/my_sys.h: Added clean up function for my_uuid() mysql-test/r/create.result: Fixed result file. mysql-test/r/maria-big.result: Changed not to get a warning. mysql-test/r/maria-connect.result: Not to get a warning. mysql-test/r/maria-recovery.result: Not to get a warning. mysql-test/r/maria.result: Fixed result file. Added test for warning on log file. mysql-test/r/ps_maria.result: Fixed result file. New bit was added to source. mysql-test/t/maria-big.test: To avoid a warning. mysql-test/t/maria-connect.test: To avoid a warning. mysql-test/t/maria-recovery.test: To avoid a warning. mysql-test/t/maria.test: To avoid a warning. mysql-test/t/ps_maria.test: To avoid a warning. mysys/my_uuid.c: Added clean up function for my_uuid() sql/mysqld.cc: Manual merge. storage/maria/Makefile.am: Added "make test" for maria. storage/maria/ma_key_recover.c: Fix for maria_recovery storage/maria/ma_test_all.sh: Deprecated file. Functionality moved to unittest/ma_test_all-t BitKeeper/deleted/.del-unit.pl: BitKeeper file /home/my/mysql-maria/storage/maria/unit.pl --- sql/mysqld.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sql/mysqld.cc') diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 91cc824b3d8..783fec7e687 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -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_uuid_generator, + LOCK_error_log, LOCK_delayed_insert, LOCK_delayed_status, LOCK_delayed_create, LOCK_crypt, LOCK_bytes_sent, LOCK_bytes_received, LOCK_global_system_variables, @@ -1282,6 +1282,7 @@ void clean_up(bool print_message) /* do the broadcast inside the lock to ensure that my_end() is not called */ (void) pthread_cond_broadcast(&COND_thread_count); (void) pthread_mutex_unlock(&LOCK_thread_count); + my_uuid_end(); /* The following lines may never be executed as the main thread may have @@ -1354,7 +1355,6 @@ 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); @@ -3105,7 +3105,6 @@ 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 -- cgit v1.2.1