diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-24 21:31:06 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-24 21:31:06 +0300 |
| commit | a82671178919afba86ddfdf2b64321eb9afff8e5 (patch) | |
| tree | dd5c0968aa7683d035c2570c2b708cf7ea8b37d6 /include | |
| parent | 918b25ec7ef208ece958d858cf03eb36033be2b7 (diff) | |
| parent | 31f66e55a8d24f7490cb17b9d12397c104b8bdee (diff) | |
| download | mariadb-git-a82671178919afba86ddfdf2b64321eb9afff8e5.tar.gz | |
Automatic merge
Fixed compiler warning
client/mysql.cc:
Fixed compiler warning
include/my_global.h:
Fixed typo
storage/maria/ha_maria.cc:
Merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/my_global.h b/include/my_global.h index b4579248dfa..7fc0f9250e0 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -799,10 +799,10 @@ typedef SOCKET_SIZE_TYPE size_socket; #endif /* get memory in huncs */ #define ONCE_ALLOC_INIT (uint) (4096-MALLOC_OVERHEAD) - /* Typical record cash */ -#define RECORD_CACHE_SIZE (uint) (64*1024-MALLOC_OVERHEAD) - /* Typical key cash */ -#define KEY_CACHE_SIZE (uint) (8*1024*1024-MALLOC_OVERHEAD) + /* Typical record cache */ +#define RECORD_CACHE_SIZE (uint) (128*1024-MALLOC_OVERHEAD) + /* Typical key cache */ +#define KEY_CACHE_SIZE (uint) (128L*1024L*1024L-MALLOC_OVERHEAD) /* Default size of a key cache block */ #define KEY_CACHE_BLOCK_SIZE (uint) 1024 |