diff options
author | unknown <acurtis/antony@ltamd64.xiphis.org> | 2007-06-06 12:03:54 -0700 |
---|---|---|
committer | unknown <acurtis/antony@ltamd64.xiphis.org> | 2007-06-06 12:03:54 -0700 |
commit | e9d8a1ed7547104b2547469543fef01f098b27a9 (patch) | |
tree | 2942c1e225c18459965d8912b097c4706ac940aa /include | |
parent | 6e6d0c31fa86bcbea89411a53883bac678ce2778 (diff) | |
parent | 9e56ab341ee3f845a1427fbaba8343e4e0f3a1fe (diff) | |
download | mariadb-git-e9d8a1ed7547104b2547469543fef01f098b27a9.tar.gz |
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
into xiphis.org:/home/antony/work2/mysql-5.0-engines.merge
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; */ |