Browse Source

Fixed typos in Query Cache.

pull/843/head
unknown 14 years ago
parent
commit
74b61f845b
  1. 8
      sql/sql_cache.cc
  2. 4
      sql/sql_cache.h

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

4
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) */

Loading…
Cancel
Save