diff options
| author | unknown <knielsen@knielsen-hq.org> | 2011-10-25 12:53:40 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2011-10-25 12:53:40 +0200 |
| commit | 5da52cd108468580f036b479be77ef80c64d1181 (patch) | |
| tree | 5aba76b06329ff2c6ef9d6f277ad57c027728ddc /sql/mysqld.cc | |
| parent | 90b43902b0e67bcd4c6a5f08d7d76c93df74d4c8 (diff) | |
| download | mariadb-git-5da52cd108468580f036b479be77ef80c64d1181.tar.gz | |
Some after-merge fixes for 5.5 merge.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 6d90c2e88b8..5846bc2238a 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -811,7 +811,7 @@ static PSI_rwlock_info all_server_rwlocks[]= }; #ifdef HAVE_MMAP -PSI_cond_key key_PAGE_cond, key_COND_active, key_COND_pool, key_COND_queue_busy; +PSI_cond_key key_PAGE_cond, key_COND_active, key_COND_pool; #endif /* HAVE_MMAP */ PSI_cond_key key_BINLOG_COND_prep_xids, key_BINLOG_update_cond, @@ -823,8 +823,11 @@ PSI_cond_key key_BINLOG_COND_prep_xids, key_BINLOG_update_cond, key_relay_log_info_data_cond, key_relay_log_info_log_space_cond, key_relay_log_info_start_cond, key_relay_log_info_stop_cond, key_TABLE_SHARE_cond, key_user_level_lock_cond, - key_COND_thread_count, key_COND_thread_cache, key_COND_flush_thread_cache; + key_COND_thread_count, key_COND_thread_cache, key_COND_flush_thread_cache, + key_BINLOG_COND_queue_busy; PSI_cond_key key_RELAYLOG_update_cond, key_COND_wakeup_ready; +PSI_cond_key key_RELAYLOG_COND_queue_busy; +PSI_cond_key key_TC_LOG_MMAP_COND_queue_busy; static PSI_cond_info all_server_conds[]= { @@ -835,10 +838,13 @@ static PSI_cond_info all_server_conds[]= { &key_PAGE_cond, "PAGE::cond", 0}, { &key_COND_active, "TC_LOG_MMAP::COND_active", 0}, { &key_COND_pool, "TC_LOG_MMAP::COND_pool", 0}, + { &key_TC_LOG_MMAP_COND_queue_busy, "TC_LOG_MMAP::COND_queue_busy", 0}, #endif /* HAVE_MMAP */ { &key_BINLOG_COND_prep_xids, "MYSQL_BIN_LOG::COND_prep_xids", 0}, { &key_BINLOG_update_cond, "MYSQL_BIN_LOG::update_cond", 0}, + { &key_BINLOG_COND_queue_busy, "MYSQL_BIN_LOG::COND_queue_busy", 0}, { &key_RELAYLOG_update_cond, "MYSQL_RELAY_LOG::update_cond", 0}, + { &key_RELAYLOG_COND_queue_busy, "MYSQL_RELAY_LOG::COND_queue_busy", 0}, { &key_COND_wakeup_ready, "THD::COND_wakeup_ready", 0}, { &key_COND_cache_status_changed, "Query_cache::COND_cache_status_changed", 0}, { &key_COND_manager, "COND_manager", PSI_FLAG_GLOBAL}, @@ -3539,7 +3545,8 @@ static int init_common_variables() mysql_bin_log.set_psi_keys(key_BINLOG_LOCK_index, key_BINLOG_update_cond, key_file_binlog, - key_file_binlog_index); + key_file_binlog_index, + key_BINLOG_COND_queue_busy); #endif /* |