diff options
| author | unknown <istruewing@chilla.local> | 2007-05-31 21:34:05 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-05-31 21:34:05 +0200 |
| commit | edd98ca5dbbbf9aea3451ae1da2c770576a04aec (patch) | |
| tree | 9f6eeb619b18692c54b10a9106d7ed4dca14d034 /sql | |
| parent | a9f967d44b18e54d5245055226d67706e66a9408 (diff) | |
| parent | a471267a242f4651724271c93c939d610ac5bdb3 (diff) | |
| download | mariadb-git-edd98ca5dbbbf9aea3451ae1da2c770576a04aec.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
into chilla.local:/home/mydev/mysql-5.1-axmrg
include/keycache.h:
Auto merged
mysql-test/r/key_cache.result:
Auto merged
sql/mysqld.cc:
Auto merged
mysys/mf_keycache.c:
SCCS merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index be376a07c49..25bad8b85c1 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5910,7 +5910,7 @@ log and this option does nothing anymore.", (uchar**) &dflt_key_cache_var.param_block_size, (uchar**) 0, 0, (GET_ULONG | GET_ASK_ADDR), REQUIRED_ARG, - KEY_CACHE_BLOCK_SIZE , 512, 1024*16, MALLOC_OVERHEAD, 512, 0}, + KEY_CACHE_BLOCK_SIZE, 512, 1024 * 16, 0, 512, 0}, {"key_cache_division_limit", OPT_KEY_CACHE_DIVISION_LIMIT, "The minimum percentage of warm blocks in key cache", (uchar**) &dflt_key_cache_var.param_division_limit, |