diff options
author | unknown <istruewing@chilla.local> | 2007-06-05 19:56:57 +0200 |
---|---|---|
committer | unknown <istruewing@chilla.local> | 2007-06-05 19:56:57 +0200 |
commit | 797bbbd4b06737a2907d5817acd2f6e334970e90 (patch) | |
tree | adbd21df23e8c0bd8559e9875ab9399a51756d7e /include | |
parent | e409a8a5c0402859ec0754e5d060e3ae06df4c6e (diff) | |
parent | b9234b1f5eb85845c4bf29d5a22f84448420d38f (diff) | |
download | mariadb-git-797bbbd4b06737a2907d5817acd2f6e334970e90.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into chilla.local:/home/mydev/mysql-5.0-axmrg
sql/mysqld.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 dc763b8cc08..54c099fc474 100644 --- a/include/keycache.h +++ b/include/keycache.h @@ -46,7 +46,6 @@ typedef struct st_key_cache my_bool key_cache_inited; 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; */ |