diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-09-06 12:18:23 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-09-06 12:18:23 +0300 |
| commit | f687e6dac0e22cbdd5330c168c24ed8f3275f47d (patch) | |
| tree | 500c99c3c480cb282e6bb0fcd642c325589317d0 /sql/sql_cache.h | |
| parent | 9bd0261897cbd592291a011b647a97c8a2be1278 (diff) | |
| parent | 5f67377327b55009daf2e3044cb0e19dcfab8175 (diff) | |
| download | mariadb-git-f687e6dac0e22cbdd5330c168c24ed8f3275f47d.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
sql/mysql_priv.h:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_cache.h:
Auto merged
configure.in:
merge
mysql-test/r/fulltext_var.result:
merge
sql/mysqld.cc:
merge
sql/set_var.cc:
merge
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 c933a2349af..b0a045a8aad 100644 --- a/sql/sql_cache.h +++ b/sql/sql_cache.h @@ -312,10 +312,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, @@ -351,6 +350,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 */ |