diff options
| author | unknown <istruewing@chilla.local> | 2007-06-16 13:14:23 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-06-16 13:14:23 +0200 |
| commit | d69c6627ba277f9eee679d99842951ec61d5bc17 (patch) | |
| tree | e063d56f114609d27cc4a326f312c701ef90cded /include | |
| parent | d38d29c363f6d783f22528fd2befa9543e06c4e9 (diff) | |
| parent | df2e2a94a80d333d97645779a27f3ac378df353d (diff) | |
| download | mariadb-git-d69c6627ba277f9eee679d99842951ec61d5bc17.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
mysql-test/r/sp.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
sql/mysqld.cc:
Auto merged
storage/myisam/ha_myisam.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; */ |