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/log.h | |
| parent | 90b43902b0e67bcd4c6a5f08d7d76c93df74d4c8 (diff) | |
| download | mariadb-git-5da52cd108468580f036b479be77ef80c64d1181.tar.gz | |
Some after-merge fixes for 5.5 merge.
Diffstat (limited to 'sql/log.h')
| -rw-r--r-- | sql/log.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/log.h b/sql/log.h index 3ec7ee96a12..bad86e7615d 100644 --- a/sql/log.h +++ b/sql/log.h @@ -539,12 +539,14 @@ public: void set_psi_keys(PSI_mutex_key key_LOCK_index, PSI_cond_key key_update_cond, PSI_file_key key_file_log, - PSI_file_key key_file_log_index) + PSI_file_key key_file_log_index, + PSI_file_key key_COND_queue_busy) { m_key_LOCK_index= key_LOCK_index; m_key_update_cond= key_update_cond; m_key_file_log= key_file_log; m_key_file_log_index= key_file_log_index; + m_key_COND_queue_busy= key_COND_queue_busy; } #endif |