diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-25 11:09:12 -0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-25 11:09:12 -0200 |
| commit | 7ed8cff9e5defbd38a7ef68680c3c63357f37947 (patch) | |
| tree | f13519c84a430a7a4ace8577cfb5bd7f4f16ce63 /sql/sql_cache.h | |
| parent | e0d658335205f42ace20c81e5f9b5eb40408bdc1 (diff) | |
| parent | 477a50060fd0aee1d6396c9278e540be9d9e9d23 (diff) | |
| download | mariadb-git-7ed8cff9e5defbd38a7ef68680c3c63357f37947.tar.gz | |
Automerge.
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); |