diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-07 12:11:16 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-07 12:11:16 +0200 |
| commit | 7ce643782ba32dda0c9e5cc98efa55d0ab48cb03 (patch) | |
| tree | f2324a755b976ec09e7abedcd9714ab4b900ecdb | |
| parent | eacefbca3596fa9cb853272265855d4efafd5f24 (diff) | |
| download | mariadb-git-7ce643782ba32dda0c9e5cc98efa55d0ab48cb03.tar.gz | |
MDEV-23379 fixup: Remove dead PERFORMANCE_SCHEMA code
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 5e9a7d951e3..0aad1347435 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -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 */ # 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 */ -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 PSI_mutex_info all_pthread_mutexes[] = { - PSI_KEY(commit_cond_mutex), PSI_KEY(pending_checkpoint_mutex), }; -static PSI_cond_info all_innodb_conds[] = { - PSI_KEY(commit_cond) -}; - # ifdef UNIV_PFS_MUTEX /* all_innodb_mutexes array contains mutexes that are performance schema instrumented if "UNIV_PFS_MUTEX" @@ -3917,9 +3910,6 @@ static int innodb_init(void* p) count = array_elements(all_innodb_files); mysql_file_register("innodb", all_innodb_files, count); # endif /* UNIV_PFS_IO */ - - count = array_elements(all_innodb_conds); - mysql_cond_register("innodb", all_innodb_conds, count); #endif /* HAVE_PSI_INTERFACE */ bool create_new_db = false; |