1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed typos in Query Cache.

Browse Source
This commit is contained in:
unknown 2012-02-03 16:56:12 +02:00
parent f5c8749a47
commit 74b61f845b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_cache.cc
View File

@ -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)
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)

4
sql/sql_cache.h
View File

@ -429,8 +429,8 @@ protected:
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) */