Commit 7ce64378 authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-23379 fixup: Remove dead PERFORMANCE_SCHEMA code

parent eacefbca
...@@ -509,21 +509,14 @@ const struct _ft_vft_ext ft_vft_ext_result = {innobase_fts_get_version, ...@@ -509,21 +509,14 @@ const struct _ft_vft_ext ft_vft_ext_result = {innobase_fts_get_version,
/* All RWLOCK used in Innodb are SX-locks */ /* All RWLOCK used in Innodb are SX-locks */
# define PSI_RWLOCK_KEY(n) {&n##_key, #n, PSI_RWLOCK_FLAG_SX} # define PSI_RWLOCK_KEY(n) {&n##_key, #n, PSI_RWLOCK_FLAG_SX}
/* Keys to register pthread mutexes/cond in the current file with /* Keys to register pthread mutexes in the current file with
performance schema */ performance schema */
static mysql_pfs_key_t commit_cond_mutex_key;
static mysql_pfs_key_t commit_cond_key;
static mysql_pfs_key_t pending_checkpoint_mutex_key; static mysql_pfs_key_t pending_checkpoint_mutex_key;
static PSI_mutex_info all_pthread_mutexes[] = { static PSI_mutex_info all_pthread_mutexes[] = {
PSI_KEY(commit_cond_mutex),
PSI_KEY(pending_checkpoint_mutex), PSI_KEY(pending_checkpoint_mutex),
}; };
static PSI_cond_info all_innodb_conds[] = {
PSI_KEY(commit_cond)
};
# ifdef UNIV_PFS_MUTEX # ifdef UNIV_PFS_MUTEX
/* all_innodb_mutexes array contains mutexes that are /* all_innodb_mutexes array contains mutexes that are
performance schema instrumented if "UNIV_PFS_MUTEX" performance schema instrumented if "UNIV_PFS_MUTEX"
...@@ -3917,9 +3910,6 @@ static int innodb_init(void* p) ...@@ -3917,9 +3910,6 @@ static int innodb_init(void* p)
count = array_elements(all_innodb_files); count = array_elements(all_innodb_files);
mysql_file_register("innodb", all_innodb_files, count); mysql_file_register("innodb", all_innodb_files, count);
# endif /* UNIV_PFS_IO */ # endif /* UNIV_PFS_IO */
count = array_elements(all_innodb_conds);
mysql_cond_register("innodb", all_innodb_conds, count);
#endif /* HAVE_PSI_INTERFACE */ #endif /* HAVE_PSI_INTERFACE */
bool create_new_db = false; bool create_new_db = false;
......
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