diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-02 07:10:16 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-02 07:10:16 +0300 |
| commit | 91d39f630db354a4cadba97a3ee70cf18ad6bd5f (patch) | |
| tree | 8fe6c7660a2e104820deb26299405a75ddd1a1c5 /storage/innobase/handler | |
| parent | b15224c71ad4896c44678f44be549113d28df931 (diff) | |
| download | mariadb-git-91d39f630db354a4cadba97a3ee70cf18ad6bd5f.tar.gz | |
Cleanup: Remove unused mutex keys
Diffstat (limited to 'storage/innobase/handler')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 5 | ||||
| -rw-r--r-- | storage/innobase/handler/i_s.cc | 27 |
2 files changed, 1 insertions, 31 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 07fcec61b7e..f2729905bce 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -522,7 +522,6 @@ static PSI_mutex_info all_innodb_mutexes[] = { PSI_KEY(ibuf_mutex), PSI_KEY(ibuf_pessimistic_insert_mutex), PSI_KEY(log_sys_mutex), - PSI_KEY(mutex_list_mutex), PSI_KEY(page_zip_stat_per_index_mutex), PSI_KEY(purge_sys_pq_mutex), PSI_KEY(recv_sys_mutex), @@ -533,7 +532,6 @@ static PSI_mutex_info all_innodb_mutexes[] = { PSI_KEY(rw_lock_debug_mutex), # endif /* UNIV_DEBUG */ PSI_KEY(rw_lock_list_mutex), - PSI_KEY(rw_lock_mutex), PSI_KEY(srv_innodb_monitor_mutex), PSI_KEY(srv_misc_tmpfile_mutex), PSI_KEY(srv_monitor_file_mutex), @@ -544,9 +542,6 @@ static PSI_mutex_info all_innodb_mutexes[] = { PSI_KEY(lock_wait_mutex), PSI_KEY(trx_mutex), PSI_KEY(srv_threads_mutex), -# ifndef PFS_SKIP_EVENT_MUTEX - PSI_KEY(event_mutex), -# endif /* PFS_SKIP_EVENT_MUTEX */ PSI_KEY(rtr_active_mutex), PSI_KEY(rtr_match_mutex), PSI_KEY(rtr_path_mutex), diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc index a5713e32d86..9d77b6625b8 100644 --- a/storage/innobase/handler/i_s.cc +++ b/storage/innobase/handler/i_s.cc @@ -7177,32 +7177,7 @@ i_s_innodb_mutexes_fill_table( /* deny access to user without PROCESS_ACL privilege */ if (check_global_access(thd, PROCESS_ACL)) { DBUG_RETURN(0); - } - - // mutex_enter(&mutex_list_mutex); - -#ifdef JAN_TODO_FIXME - ib_mutex_t* mutex; - for (mutex = UT_LIST_GET_FIRST(os_mutex_list); mutex != NULL; - mutex = UT_LIST_GET_NEXT(list, mutex)) { - if (mutex->count_os_wait == 0) { - continue; - } - - OK(field_store_string(fields[MUTEXES_NAME], mutex->cmutex_name)); - OK(field_store_string(fields[MUTEXES_CREATE_FILE], - innobase_basename(mutex->cfile_name))); - OK(fields[MUTEXES_CREATE_LINE]->store(lock->cline, true)); - fields[MUTEXES_CREATE_LINE]->set_notnull(); - OK(fields[MUTEXES_OS_WAITS]->store(lock->count_os_wait, true)); - fields[MUTEXES_OS_WAITS]->set_notnull(); - OK(schema_table_store_record(thd, tables->table)); - } - - mutex_exit(&mutex_list_mutex); -#endif /* JAN_TODO_FIXME */ - - { + } else { struct Locking { Locking() { mutex_enter(&rw_lock_list_mutex); } |