diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-09-06 20:51:15 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-09-06 20:51:15 +0300 |
| commit | 5618d0217ec3fce5793bb3891bf4ce2ede8b3a10 (patch) | |
| tree | 198b1f598b6fe14dd90b06b1ba4fa81f66ea2aea /sql/sql_cache.h | |
| parent | 9e7a1bb2b019a1a8048bc9ef8cdf00fcc255d812 (diff) | |
| parent | 9d14671fc9c484f8fbcd11d509335eaf9e7d089e (diff) | |
| download | mariadb-git-5618d0217ec3fce5793bb3891bf4ce2ede8b3a10.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-mrg-5.0
configure.in:
Auto merged
mysql-test/r/func_math.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/t/func_math.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_cache.h:
Auto merged
Diffstat (limited to 'sql/sql_cache.h')
| -rw-r--r-- | sql/sql_cache.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_cache.h b/sql/sql_cache.h index c1b08904f51..123d16b606d 100644 --- a/sql/sql_cache.h +++ b/sql/sql_cache.h @@ -327,10 +327,9 @@ protected: Following function control structure_guard_mutex by themself or don't need structure_guard_mutex */ - void init(); ulong init_cache(); void make_disabled(); - void free_cache(my_bool destruction); + void free_cache(); Query_cache_block *write_block_data(ulong data_len, gptr data, ulong header_len, Query_cache_block::block_type type, @@ -366,6 +365,8 @@ protected: uint def_query_hash_size = QUERY_CACHE_DEF_QUERY_HASH_SIZE, uint def_table_hash_size = QUERY_CACHE_DEF_TABLE_HASH_SIZE); + /* initialize cache (mutex) */ + void init(); /* resize query cache (return real query size, 0 if disabled) */ ulong resize(ulong query_cache_size); /* set limit on result size */ |