Commit 95ae1365 authored by Vasil Dimov's avatar Vasil Dimov

PS-instrument the array of latches (rw locks) dict_table_stats_latches[].

This adds 64 new rows to performance_schema.rwlock_instances.

This patch will make perfschema.binlog_mix perfschema.binlog_row tests fail,
but they will be fixed by http://lists.mysql.com/commits/127862

Approved by:	Jimmy (rb://554)
parent 2ab143a8
...@@ -75,6 +75,7 @@ UNIV_INTERN rw_lock_t dict_operation_lock; ...@@ -75,6 +75,7 @@ UNIV_INTERN rw_lock_t dict_operation_lock;
#ifdef UNIV_PFS_RWLOCK #ifdef UNIV_PFS_RWLOCK
UNIV_INTERN mysql_pfs_key_t dict_operation_lock_key; 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 index_tree_rw_lock_key;
UNIV_INTERN mysql_pfs_key_t dict_table_stats_latch_key;
#endif /* UNIV_PFS_RWLOCK */ #endif /* UNIV_PFS_RWLOCK */
#ifdef UNIV_PFS_MUTEX #ifdef UNIV_PFS_MUTEX
...@@ -715,7 +716,7 @@ dict_init(void) ...@@ -715,7 +716,7 @@ dict_init(void)
&dict_foreign_err_mutex, SYNC_ANY_LATCH); &dict_foreign_err_mutex, SYNC_ANY_LATCH);
for (i = 0; i < DICT_TABLE_STATS_LATCHES_SIZE; i++) { 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); &dict_table_stats_latches[i], SYNC_INDEX_TREE);
} }
} }
......
...@@ -285,7 +285,8 @@ static PSI_rwlock_info all_innodb_rwlocks[] = { ...@@ -285,7 +285,8 @@ static PSI_rwlock_info all_innodb_rwlocks[] = {
{&checkpoint_lock_key, "checkpoint_lock", 0}, {&checkpoint_lock_key, "checkpoint_lock", 0},
{&trx_i_s_cache_lock_key, "trx_i_s_cache_lock", 0}, {&trx_i_s_cache_lock_key, "trx_i_s_cache_lock", 0},
{&trx_purge_latch_key, "trx_purge_latch", 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 */ # endif /* UNIV_PFS_RWLOCK */
......
...@@ -122,6 +122,7 @@ extern mysql_pfs_key_t checkpoint_lock_key; ...@@ -122,6 +122,7 @@ extern mysql_pfs_key_t checkpoint_lock_key;
extern mysql_pfs_key_t trx_i_s_cache_lock_key; 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 trx_purge_latch_key;
extern mysql_pfs_key_t index_tree_rw_lock_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 */ #endif /* UNIV_PFS_RWLOCK */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment