bzr commit into mysql-5.5-innodb branch (vasil.dimov:3269)

[vasil.dimov]

#At file:///usr/local/devel/bzrroot/server/mysql-5.5-innodb/ based on revid:calvin.sun@stripped

 3269 Vasil Dimov	2011-01-04
      PS-instrument the array of latches (rw locks) dict_table_stats_latches[].
      
      This adds 64 new rows to performance_schema.rwlock_instances.
      
      Approved by:	Jimmy (rb://554)

    modified:
      storage/innobase/dict/dict0dict.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/sync0rw.h
=== modified file 'storage/innobase/dict/dict0dict.c'
--- a/storage/innobase/dict/dict0dict.c	revid:calvin.sun@stripped
+++ b/storage/innobase/dict/dict0dict.c	revid:vasil.dimov@stripped
@@ -75,6 +75,7 @@ UNIV_INTERN rw_lock_t	dict_operation_loc
 #ifdef UNIV_PFS_RWLOCK
 UNIV_INTERN mysql_pfs_key_t	dict_operation_lock_key;
 UNIV_INTERN mysql_pfs_key_t	index_tree_rw_lock_key;
+UNIV_INTERN mysql_pfs_key_t	dict_table_stats_latch_key;
 #endif /* UNIV_PFS_RWLOCK */
 
 #ifdef UNIV_PFS_MUTEX
@@ -715,7 +716,7 @@ dict_init(void)
 		     &dict_foreign_err_mutex, SYNC_ANY_LATCH);
 
 	for (i = 0; i < DICT_TABLE_STATS_LATCHES_SIZE; i++) {
-		rw_lock_create(PFS_NOT_INSTRUMENTED,
+		rw_lock_create(dict_table_stats_latch_key,
 			       &dict_table_stats_latches[i], SYNC_INDEX_TREE);
 	}
 }

=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	revid:calvin.sun@stripped
+++ b/storage/innobase/handler/ha_innodb.cc	revid:vasil.dimov@stripped
@@ -285,7 +285,8 @@ static PSI_rwlock_info all_innodb_rwlock
 	{&checkpoint_lock_key, "checkpoint_lock", 0},
 	{&trx_i_s_cache_lock_key, "trx_i_s_cache_lock", 0},
 	{&trx_purge_latch_key, "trx_purge_latch", 0},
-	{&index_tree_rw_lock_key, "index_tree_rw_lock", 0}
+	{&index_tree_rw_lock_key, "index_tree_rw_lock", 0},
+	{&dict_table_stats_latch_key, "dict_table_stats", 0}
 };
 # endif /* UNIV_PFS_RWLOCK */
 

=== modified file 'storage/innobase/include/sync0rw.h'
--- a/storage/innobase/include/sync0rw.h	revid:calvin.sun@stripped
+++ b/storage/innobase/include/sync0rw.h	revid:vasil.dimov@stripped
@@ -122,6 +122,7 @@ extern	mysql_pfs_key_t	checkpoint_lock_k
 extern	mysql_pfs_key_t	trx_i_s_cache_lock_key;
 extern	mysql_pfs_key_t	trx_purge_latch_key;
 extern	mysql_pfs_key_t	index_tree_rw_lock_key;
+extern	mysql_pfs_key_t	dict_table_stats_latch_key;
 #endif /* UNIV_PFS_RWLOCK */
 
 


Attachment: [text/bzr-bundle] bzr/[e-mail]