diff options
author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-28 15:54:16 +0300 |
---|---|---|
committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-28 15:54:16 +0300 |
commit | 85d5a08b51e24af57120068bed4534e4c1e889f4 (patch) | |
tree | 0bab5217d4ea83929d314c2ce29f962a949c95c8 /include/keycache.h | |
parent | ece5ad57e9b2505732be4b043440d9e5a5dc3b9a (diff) | |
parent | 31cd0643ae1b5670d4ebd89eb001f2bcda400d2a (diff) | |
download | mariadb-git-85d5a08b51e24af57120068bed4534e4c1e889f4.tar.gz |
Manual merge of WL#4738 from mysql-next-mr:
- backported code that handles %f/%g arguments in
my_vsnprintf.c from 6.0
- backported %f/%g tests in unittest/mysys/my_vsnprintf-t.c
from 6.0
- replaced snprintf("%g") in sql/set_var.cc with my_gcvt()
- removed unnecessary "--replace-result"s for Windows in
mysql-test/suite/sys_vars/t/long_query_time_basic.test
- some test results adjustments
Diffstat (limited to 'include/keycache.h')
-rw-r--r-- | include/keycache.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/keycache.h b/include/keycache.h index 4e715dda88d..cd5c83e144e 100644 --- a/include/keycache.h +++ b/include/keycache.h @@ -87,10 +87,10 @@ typedef struct st_key_cache initializing the key cache. */ - ulonglong param_buff_size; /* size the memory allocated for the cache */ - ulong param_block_size; /* size of the blocks in the key cache */ - ulong param_division_limit; /* min. percentage of warm blocks */ - ulong param_age_threshold; /* determines when hot block is downgraded */ + ulonglong param_buff_size; /* size the memory allocated for the cache */ + ulonglong param_block_size; /* size of the blocks in the key cache */ + ulonglong param_division_limit; /* min. percentage of warm blocks */ + ulonglong param_age_threshold; /* determines when hot block is downgraded */ /* Statistics variables. These are reset in reset_key_cache_counters(). */ ulong global_blocks_changed; /* number of currently dirty blocks */ |