diff options
| author | Kristofer Pettersson <kristofer.pettersson@sun.com> | 2009-11-20 13:49:06 +0100 |
|---|---|---|
| committer | Kristofer Pettersson <kristofer.pettersson@sun.com> | 2009-11-20 13:49:06 +0100 |
| commit | 41085809c39f1dc44d530a83b59ba8d0d14c1d8d (patch) | |
| tree | 24af0f76056f7acfacd3c2c81b77c7ed251ecba9 /sql/sql_cache.h | |
| parent | 8369f619d446dcf6a4e94ce98ff8e85792491ea2 (diff) | |
| download | mariadb-git-41085809c39f1dc44d530a83b59ba8d0d14c1d8d.tar.gz | |
Bug#39253 Large query cache still freezes server after fix for bug #21074
This patch introduce a limit on the time the query cache can
block with a lock on SELECTs.
Other operations which causes a change in the table
data will still be blocked.
sql/sql_cache.cc:
* Introduced a timeout value for the qc lock when entering send_result_to_client()
and store_query() methods.
sql/sql_cache.h:
* New signature for Query_cache::try_lock()
Diffstat (limited to 'sql/sql_cache.h')
| -rw-r--r-- | sql/sql_cache.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_cache.h b/sql/sql_cache.h index 777ddd39280..44fc3123b98 100644 --- a/sql/sql_cache.h +++ b/sql/sql_cache.h @@ -485,7 +485,7 @@ protected: const char *name); my_bool in_blocks(Query_cache_block * point); - bool try_lock(void); + bool try_lock(bool use_timeout= FALSE); void lock(void); void lock_and_suspend(void); void unlock(void); |