diff options
Diffstat (limited to 'sql/log.h')
| -rw-r--r-- | sql/log.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sql/log.h b/sql/log.h index 8684eaba786..e4424778111 100644 --- a/sql/log.h +++ b/sql/log.h @@ -412,7 +412,6 @@ struct wait_for_commit; class MYSQL_BIN_LOG: public TC_LOG, private MYSQL_LOG { -#ifdef HAVE_PSI_INTERFACE /** The instrumentation key to use for @ LOCK_index. */ PSI_mutex_key m_key_LOCK_index; /** The instrumentation key to use for @ COND_relay_log_updated */ @@ -420,14 +419,13 @@ class MYSQL_BIN_LOG: public TC_LOG, private MYSQL_LOG /** The instrumentation key to use for @ COND_bin_log_updated */ PSI_cond_key m_key_bin_log_update; /** The instrumentation key to use for opening the log file. */ - PSI_file_key m_key_file_log; + PSI_file_key m_key_file_log, m_key_file_log_cache; /** The instrumentation key to use for opening the log index file. */ - PSI_file_key m_key_file_log_index; + PSI_file_key m_key_file_log_index, m_key_file_log_index_cache; - PSI_file_key m_key_COND_queue_busy; + PSI_cond_key m_key_COND_queue_busy; /** The instrumentation key to use for LOCK_binlog_end_pos. */ PSI_mutex_key m_key_LOCK_binlog_end_pos; -#endif struct group_commit_entry { @@ -587,7 +585,7 @@ public: :binlog_id(0), xid_count(0), notify_count(0) { binlog_name_len= log_file_name_len; - binlog_name= (char *) my_malloc(binlog_name_len, MYF(MY_ZEROFILL)); + binlog_name= (char *) my_malloc(PSI_INSTRUMENT_ME, binlog_name_len, MYF(MY_ZEROFILL)); if (binlog_name) memcpy(binlog_name, log_file_name, binlog_name_len); } @@ -674,15 +672,19 @@ public: PSI_cond_key key_relay_log_update, PSI_cond_key key_bin_log_update, PSI_file_key key_file_log, + PSI_file_key key_file_log_cache, PSI_file_key key_file_log_index, - PSI_file_key key_COND_queue_busy, + PSI_file_key key_file_log_index_cache, + PSI_cond_key key_COND_queue_busy, PSI_mutex_key key_LOCK_binlog_end_pos) { m_key_LOCK_index= key_LOCK_index; m_key_relay_log_update= key_relay_log_update; m_key_bin_log_update= key_bin_log_update; m_key_file_log= key_file_log; + m_key_file_log_cache= key_file_log_cache; m_key_file_log_index= key_file_log_index; + m_key_file_log_index_cache= key_file_log_index_cache; m_key_COND_queue_busy= key_COND_queue_busy; m_key_LOCK_binlog_end_pos= key_LOCK_binlog_end_pos; } |