diff options
| author | unknown <sanja@montyprogram.com> | 2012-02-03 16:56:12 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2012-02-03 16:56:12 +0200 |
| commit | 74b61f845b26257e7f44a5bb602529b4cb7638a9 (patch) | |
| tree | b253219ed7f50dba8b1bcc83f24b07947cf64ed5 | |
| parent | f5c8749a4751526abe625e92afdace6f8d63d8d8 (diff) | |
| download | mariadb-git-74b61f845b26257e7f44a5bb602529b4cb7638a9.tar.gz | |
Fixed typos in Query Cache.
| -rw-r--r-- | sql/sql_cache.cc | 8 | ||||
| -rw-r--r-- | sql/sql_cache.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 16b6d78576a..c45234f2cdf 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1452,10 +1452,10 @@ def_week_frmt: %lu, in_trans: %d, autocommit: %d", In case the wait time can't be determined there is an upper limit which causes try_lock() to abort with a time out. - The 'TRUE' parameter indicate that the lock is allowed to timeout + The 'TIMEOUT' parameter indicate that the lock is allowed to timeout */ - if (try_lock(thd, Query_cache::WAIT)) + if (try_lock(thd, Query_cache::TIMEOUT)) DBUG_VOID_RETURN; if (query_cache_size == 0) { @@ -1781,9 +1781,9 @@ Query_cache::send_result_to_client(THD *thd, char *org_sql, uint query_length) disabled or if a full cache flush is in progress, the attempt to get the lock is aborted. - The WAIT parameter indicate that the lock is allowed to timeout. + The TIMEOUT parameter indicate that the lock is allowed to timeout. */ - if (try_lock(thd, Query_cache::WAIT)) + if (try_lock(thd, Query_cache::TIMEOUT)) goto err; if (query_cache_size == 0) diff --git a/sql/sql_cache.h b/sql/sql_cache.h index eeaac8f6b62..b2e88a3c619 100644 --- a/sql/sql_cache.h +++ b/sql/sql_cache.h @@ -429,8 +429,8 @@ protected: uint def_query_hash_size = QUERY_CACHE_DEF_QUERY_HASH_SIZE, uint def_table_hash_size = QUERY_CACHE_DEF_TABLE_HASH_SIZE); - bool is_disabled(void) { return m_cache_status != OK; } - bool is_disable_in_progress(void) + inline bool is_disabled(void) { return m_cache_status != OK; } + inline bool is_disable_in_progress(void) { return m_cache_status == DISABLE_REQUEST; } /* initialize cache (mutex) */ |