diff options
| author | unknown <istruewing@chilla.local> | 2007-06-16 11:34:21 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-06-16 11:34:21 +0200 |
| commit | 3e2e6ea9e310a0f283af6b8069674f858d0a8a1f (patch) | |
| tree | 73d482016d7e8dfe38b5a1fab4679a9c77ff09e4 /sql/mysqld.cc | |
| parent | 2552a16ee44d094395776d0381b54ef1df589a49 (diff) | |
| parent | 559bc9399a0431cce06ef0bab15712fe9d55203c (diff) | |
| download | mariadb-git-3e2e6ea9e310a0f283af6b8069674f858d0a8a1f.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.0-amain
into chilla.local:/home/mydev/mysql-5.0-axmrg
configure.in:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -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 ec32e237a01..49d997f391e 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5839,7 +5839,7 @@ log and this option does nothing anymore.", (gptr*) &dflt_key_cache_var.param_block_size, (gptr*) 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", (gptr*) &dflt_key_cache_var.param_division_limit, |