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 /include/keycache.h | |
| 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 'include/keycache.h')
| -rw-r--r-- | include/keycache.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/keycache.h b/include/keycache.h index 9ebb7d5b992..7f4ce86cea0 100644 --- a/include/keycache.h +++ b/include/keycache.h @@ -47,7 +47,6 @@ typedef struct st_key_cache my_bool in_resize; /* true during resize operation */ my_bool resize_in_flush; /* true during flush of resize operation */ my_bool can_be_used; /* usage of cache for read/write is allowed */ - uint key_cache_shift; ulong key_cache_mem_size; /* specified size of the cache memory */ uint key_cache_block_size; /* size of the page buffer of a cache block */ ulong min_warm_blocks; /* min number of warm blocks; */ |