diff options
| author | unknown <istruewing@chilla.local> | 2007-06-11 19:25:12 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-06-11 19:25:12 +0200 |
| commit | b6f1596972e85cbb49a9e76a16cdb53ffd3dc672 (patch) | |
| tree | 215fc8c9bbac49d30e1c421aaa9b844023779204 /include | |
| parent | 73016f8f90edecb433e7ebbf09f0b261c19dce84 (diff) | |
| parent | 5f26429db469128d189488fa161aedeb4eb7090a (diff) | |
| download | mariadb-git-b6f1596972e85cbb49a9e76a16cdb53ffd3dc672.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.1-amain
into chilla.local:/home/mydev/mysql-5.1-axmrg
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysys/mf_keycache.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'include')
| -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; */ |