diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-06-11 12:07:59 +0200 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-06-11 12:07:59 +0200 |
| commit | a22c8c5be5ceadd23eed707ae2f1308ced2de977 (patch) | |
| tree | 796cc97d1d103e18e0672d9b57dee4c54857073c /mysys/mf_keycache.c | |
| parent | 510835a0727fc1ebe98e2808cae91c8ab014d27e (diff) | |
| parent | 585cf08fe6a8d6e237732daa94a969f93e5c84ec (diff) | |
| download | mariadb-git-a22c8c5be5ceadd23eed707ae2f1308ced2de977.tar.gz | |
Merge MySQL 5.1.35 into MySQL 5.4
Diffstat (limited to 'mysys/mf_keycache.c')
| -rw-r--r-- | mysys/mf_keycache.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 5274509a1d5..a635f796f46 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -2045,13 +2045,15 @@ restart: } else { + size_t block_mem_offset; /* There are some never used blocks, take first of them */ DBUG_ASSERT(keycache->blocks_used < (ulong) keycache->disk_blocks); block= &keycache->block_root[keycache->blocks_used]; + block_mem_offset= + ((size_t) keycache->blocks_used) * keycache->key_cache_block_size; block->buffer= ADD_TO_PTR(keycache->block_mem, - ((ulong) keycache->blocks_used* - keycache->key_cache_block_size), + block_mem_offset, uchar*); keycache->blocks_used++; DBUG_ASSERT(!block->next_used); @@ -2405,7 +2407,7 @@ static void read_block(KEY_CACHE *keycache, BLOCK_LINK *block, uint read_length, uint min_length, my_bool primary) { - uint got_length; + size_t got_length; /* On entry cache_lock is locked */ |