MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Marc Alff Date:October 29 2009 3:07pm
Subject:bzr commit into mysql-5.5-next-mr-bugfixing branch (marc.alff:2929) Bug#38967
View as plain text  
#At file:///home/malff/BZR_TREE/mysql-next-mr-bugfixing/ based on revid:tor.didriksen@stripped

 2929 Marc Alff	2009-10-29
      Bug#38967 Unused mutex LOCK_Acl
      
      Backport to 5.5

    modified:
      sql/mysql_priv.h
      sql/mysqld.cc
=== modified file 'sql/mysql_priv.h'
--- a/sql/mysql_priv.h	2009-10-22 22:30:28 +0000
+++ b/sql/mysql_priv.h	2009-10-29 15:07:29 +0000
@@ -1963,7 +1963,7 @@ extern FILE *bootstrap_file;
 extern int bootstrap_error;
 extern FILE *stderror_file;
 extern pthread_key(MEM_ROOT**,THR_MALLOC);
-extern pthread_mutex_t LOCK_mysql_create_db,LOCK_Acl,LOCK_open, LOCK_lock_db,
+extern pthread_mutex_t LOCK_mysql_create_db, LOCK_open, LOCK_lock_db,
        LOCK_mapped_file,LOCK_user_locks, LOCK_status,
        LOCK_error_log, LOCK_delayed_insert, LOCK_uuid_generator,
        LOCK_delayed_status, LOCK_delayed_create, LOCK_crypt, LOCK_timezone,

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2009-10-27 09:59:09 +0000
+++ b/sql/mysqld.cc	2009-10-29 15:07:29 +0000
@@ -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);


Attachment: [text/bzr-bundle] bzr/marc.alff@sun.com-20091029150729-wseh78p4325xst90.bundle
Thread
bzr commit into mysql-5.5-next-mr-bugfixing branch (marc.alff:2929) Bug#38967Marc Alff29 Oct