From: Jon Olav Hauglid Date: March 3 2011 8:21am Subject: bzr commit into mysql-trunk branch (jon.hauglid:3722) Bug#11829666 List-Archive: http://lists.mysql.com/commits/132341 X-Bug: 11829666 Message-Id: <201103030822.p238MFAa006025@rcsinet13.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7772333497183377516==" --===============7772333497183377516== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///export/home/x/mysql-trunk-bug60180/ based on revid:anitha.gopi@stripped 3722 Jon Olav Hauglid 2011-03-03 Bug #11829666 (former 60180) Unused mutex THR_LOCK_isam The problem was that the THR_LOCK_isam mutex was declared, initialized and destroyed, but not used anywhere. This patch removes the THR_LOCK_isam mutex completely. No functional changes. No test case added. modified: mysql-test/suite/perfschema/r/server_init.result mysql-test/suite/perfschema/t/server_init.test mysys/my_init.c mysys/my_thr_init.c mysys/mysys_priv.h === modified file 'mysql-test/suite/perfschema/r/server_init.result' --- a/mysql-test/suite/perfschema/r/server_init.result 2011-01-13 11:31:20 +0000 +++ b/mysql-test/suite/perfschema/r/server_init.result 2011-03-03 08:21:48 +0000 @@ -12,10 +12,6 @@ where name like "wait/synch/mutex/mysys/ count(name) 1 select count(name) from mutex_instances -where name like "wait/synch/mutex/mysys/THR_LOCK_isam"; -count(name) -1 -select count(name) from mutex_instances where name like "wait/synch/mutex/mysys/THR_LOCK_myisam"; count(name) 1 === modified file 'mysql-test/suite/perfschema/t/server_init.test' --- a/mysql-test/suite/perfschema/t/server_init.test 2011-01-13 11:31:20 +0000 +++ b/mysql-test/suite/perfschema/t/server_init.test 2011-03-03 08:21:48 +0000 @@ -38,9 +38,6 @@ select count(name) from mutex_instances where name like "wait/synch/mutex/mysys/THR_LOCK_open"; select count(name) from mutex_instances - where name like "wait/synch/mutex/mysys/THR_LOCK_isam"; - -select count(name) from mutex_instances where name like "wait/synch/mutex/mysys/THR_LOCK_myisam"; select count(name) from mutex_instances === modified file 'mysys/my_init.c' --- a/mysys/my_init.c 2011-03-01 13:39:58 +0000 +++ b/mysys/my_init.c 2011-03-03 08:21:48 +0000 @@ -474,7 +474,7 @@ PSI_mutex_key key_LOCK_gethostbyname_r; PSI_mutex_key key_BITMAP_mutex, key_IO_CACHE_append_buffer_lock, key_IO_CACHE_SHARE_mutex, key_KEY_CACHE_cache_lock, key_LOCK_alarm, key_my_thread_var_mutex, key_THR_LOCK_charset, key_THR_LOCK_heap, - key_THR_LOCK_isam, key_THR_LOCK_lock, key_THR_LOCK_malloc, + key_THR_LOCK_lock, key_THR_LOCK_malloc, key_THR_LOCK_mutex, key_THR_LOCK_myisam, key_THR_LOCK_net, key_THR_LOCK_open, key_THR_LOCK_threads, key_TMPDIR_mutex, key_THR_LOCK_myisam_mmap; @@ -498,7 +498,6 @@ static PSI_mutex_info all_mysys_mutexes[ { &key_my_thread_var_mutex, "my_thread_var::mutex", 0}, { &key_THR_LOCK_charset, "THR_LOCK_charset", PSI_FLAG_GLOBAL}, { &key_THR_LOCK_heap, "THR_LOCK_heap", PSI_FLAG_GLOBAL}, - { &key_THR_LOCK_isam, "THR_LOCK_isam", PSI_FLAG_GLOBAL}, { &key_THR_LOCK_lock, "THR_LOCK_lock", PSI_FLAG_GLOBAL}, { &key_THR_LOCK_malloc, "THR_LOCK_malloc", PSI_FLAG_GLOBAL}, { &key_THR_LOCK_mutex, "THR_LOCK::mutex", 0}, === modified file 'mysys/my_thr_init.c' --- a/mysys/my_thr_init.c 2011-03-01 13:39:58 +0000 +++ b/mysys/my_thr_init.c 2011-03-03 08:21:48 +0000 @@ -24,7 +24,7 @@ pthread_key(struct st_my_thread_var*, THR_KEY_mysys); mysql_mutex_t THR_LOCK_malloc, THR_LOCK_open, - THR_LOCK_lock, THR_LOCK_isam, THR_LOCK_myisam, THR_LOCK_heap, + THR_LOCK_lock, THR_LOCK_myisam, THR_LOCK_heap, THR_LOCK_net, THR_LOCK_charset, THR_LOCK_threads, THR_LOCK_myisam_mmap; @@ -88,9 +88,6 @@ void my_thread_global_reinit(void) my_init_mysys_psi_keys(); #endif - mysql_mutex_destroy(&THR_LOCK_isam); - mysql_mutex_init(key_THR_LOCK_isam, &THR_LOCK_isam, MY_MUTEX_INIT_SLOW); - mysql_mutex_destroy(&THR_LOCK_heap); mysql_mutex_init(key_THR_LOCK_heap, &THR_LOCK_heap, MY_MUTEX_INIT_FAST); @@ -212,7 +209,6 @@ my_bool my_thread_global_init(void) #endif /* TARGET_OS_LINUX */ mysql_mutex_init(key_THR_LOCK_lock, &THR_LOCK_lock, MY_MUTEX_INIT_FAST); - mysql_mutex_init(key_THR_LOCK_isam, &THR_LOCK_isam, MY_MUTEX_INIT_SLOW); mysql_mutex_init(key_THR_LOCK_myisam, &THR_LOCK_myisam, MY_MUTEX_INIT_SLOW); mysql_mutex_init(key_THR_LOCK_myisam_mmap, &THR_LOCK_myisam_mmap, MY_MUTEX_INIT_FAST); mysql_mutex_init(key_THR_LOCK_heap, &THR_LOCK_heap, MY_MUTEX_INIT_FAST); @@ -275,7 +271,6 @@ void my_thread_global_end(void) mysql_mutex_destroy(&THR_LOCK_malloc); mysql_mutex_destroy(&THR_LOCK_open); mysql_mutex_destroy(&THR_LOCK_lock); - mysql_mutex_destroy(&THR_LOCK_isam); mysql_mutex_destroy(&THR_LOCK_myisam); mysql_mutex_destroy(&THR_LOCK_myisam_mmap); mysql_mutex_destroy(&THR_LOCK_heap); === modified file 'mysys/mysys_priv.h' --- a/mysys/mysys_priv.h 2011-01-13 11:31:20 +0000 +++ b/mysys/mysys_priv.h 2011-03-03 08:21:48 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2000, 2011 Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -43,7 +43,7 @@ extern PSI_mutex_key key_LOCK_gethostbyn extern PSI_mutex_key key_BITMAP_mutex, key_IO_CACHE_append_buffer_lock, key_IO_CACHE_SHARE_mutex, key_KEY_CACHE_cache_lock, key_LOCK_alarm, key_my_thread_var_mutex, key_THR_LOCK_charset, key_THR_LOCK_heap, - key_THR_LOCK_isam, key_THR_LOCK_lock, key_THR_LOCK_malloc, + key_THR_LOCK_lock, key_THR_LOCK_malloc, key_THR_LOCK_mutex, key_THR_LOCK_myisam, key_THR_LOCK_net, key_THR_LOCK_open, key_THR_LOCK_threads, key_TMPDIR_mutex, key_THR_LOCK_myisam_mmap; @@ -59,7 +59,7 @@ extern PSI_thread_key key_thread_alarm; #endif /* HAVE_PSI_INTERFACE */ extern mysql_mutex_t THR_LOCK_malloc, THR_LOCK_open, THR_LOCK_keycache; -extern mysql_mutex_t THR_LOCK_lock, THR_LOCK_isam, THR_LOCK_net; +extern mysql_mutex_t THR_LOCK_lock, THR_LOCK_net; extern mysql_mutex_t THR_LOCK_charset; #include --===============7772333497183377516== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/jon.hauglid@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@stripped # target_branch: file:///export/home/x/mysql-trunk-bug60180/ # testament_sha1: 0f4b17274c4ac5c6ec14d0e55cd88a22e80ca45d # timestamp: 2011-03-03 09:21:52 +0100 # base_revision_id: anitha.gopi@stripped\ # 6l24ru1tu4kumsgx # # Begin bundle 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 g/wXckU4UJDfbETB --===============7772333497183377516==--