1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

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
This commit is contained in:
unknown
2005-09-06 20:51:15 +03:00
8 changed files with 129 additions and 65 deletions

View File

@ -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 */