Commit 74b61f84 authored by unknown's avatar unknown

Fixed typos in Query Cache.

parent f5c8749a
...@@ -1452,10 +1452,10 @@ def_week_frmt: %lu, in_trans: %d, autocommit: %d", ...@@ -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 In case the wait time can't be determined there is an upper limit which
causes try_lock() to abort with a time out. 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; DBUG_VOID_RETURN;
if (query_cache_size == 0) if (query_cache_size == 0)
{ {
...@@ -1781,9 +1781,9 @@ Query_cache::send_result_to_client(THD *thd, char *org_sql, uint query_length) ...@@ -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 disabled or if a full cache flush is in progress, the attempt to
get the lock is aborted. 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; goto err;
if (query_cache_size == 0) if (query_cache_size == 0)
......
...@@ -429,8 +429,8 @@ class Query_cache ...@@ -429,8 +429,8 @@ class Query_cache
uint def_query_hash_size = QUERY_CACHE_DEF_QUERY_HASH_SIZE, uint def_query_hash_size = QUERY_CACHE_DEF_QUERY_HASH_SIZE,
uint def_table_hash_size = QUERY_CACHE_DEF_TABLE_HASH_SIZE); uint def_table_hash_size = QUERY_CACHE_DEF_TABLE_HASH_SIZE);
bool is_disabled(void) { return m_cache_status != OK; } inline bool is_disabled(void) { return m_cache_status != OK; }
bool is_disable_in_progress(void) inline bool is_disable_in_progress(void)
{ return m_cache_status == DISABLE_REQUEST; } { return m_cache_status == DISABLE_REQUEST; }
/* initialize cache (mutex) */ /* initialize cache (mutex) */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment