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.h | |
| parent | 90b43902b0e67bcd4c6a5f08d7d76c93df74d4c8 (diff) | |
| download | mariadb-git-5da52cd108468580f036b479be77ef80c64d1181.tar.gz | |
Some after-merge fixes for 5.5 merge.
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index cd3d7c37b37..26dc47214f6 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -247,8 +247,7 @@ extern PSI_rwlock_key key_rwlock_LOCK_grant, key_rwlock_LOCK_logger, key_rwlock_LOCK_system_variables_hash, key_rwlock_query_cache_query_lock; #ifdef HAVE_MMAP -extern PSI_cond_key key_PAGE_cond, key_COND_active, key_COND_pool, - key_COND_queue_busy; +extern PSI_cond_key key_PAGE_cond, key_COND_active, key_COND_pool; #endif /* HAVE_MMAP */ extern PSI_cond_key key_BINLOG_COND_prep_xids, key_BINLOG_update_cond, @@ -262,6 +261,8 @@ extern PSI_cond_key key_BINLOG_COND_prep_xids, key_BINLOG_update_cond, key_TABLE_SHARE_cond, key_user_level_lock_cond, key_COND_thread_count, key_COND_thread_cache, key_COND_flush_thread_cache; extern PSI_cond_key key_RELAYLOG_update_cond, key_COND_wakeup_ready; +extern PSI_cond_key key_RELAYLOG_COND_queue_busy; +extern PSI_cond_key key_TC_LOG_MMAP_COND_queue_busy; extern PSI_thread_key key_thread_bootstrap, key_thread_delayed_insert, key_thread_handle_manager, key_thread_kill_server, key_thread_main, |