summaryrefslogtreecommitdiffstats
path: root/sql/log.h
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-18 13:22:53 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-18 13:22:53 +0000
commit347c164c35eddab388009470e6848cb361ac93f8 (patch)
tree2c0c44eac690f510bb0a35b2a13b36d606b77b6b /sql/log.h
parentReleasing progress-linux version 1:10.11.7-4~progress7.99u1. (diff)
downloadmariadb-347c164c35eddab388009470e6848cb361ac93f8.tar.xz
mariadb-347c164c35eddab388009470e6848cb361ac93f8.zip
Merging upstream version 1:10.11.8.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'sql/log.h')
-rw-r--r--sql/log.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/sql/log.h b/sql/log.h
index ae813f75..bcccd3e4 100644
--- a/sql/log.h
+++ b/sql/log.h
@@ -426,6 +426,7 @@ 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 */
@@ -440,6 +441,16 @@ class MYSQL_BIN_LOG: public TC_LOG, private MYSQL_LOG
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;
+#else
+ static constexpr PSI_mutex_key m_key_LOCK_index= 0;
+ static constexpr PSI_cond_key m_key_relay_log_update= 0;
+ static constexpr PSI_cond_key m_key_bin_log_update= 0;
+ static constexpr PSI_file_key m_key_file_log= 0, m_key_file_log_cache= 0;
+ static constexpr PSI_file_key m_key_file_log_index= 0;
+ static constexpr PSI_file_key m_key_file_log_index_cache= 0;
+ static constexpr PSI_cond_key m_key_COND_queue_busy= 0;
+ static constexpr PSI_mutex_key m_key_LOCK_binlog_end_pos= 0;
+#endif
struct group_commit_entry
{