diff options
| author | unknown <bell@desktop.sanja.is.com.ua> | 2007-02-02 13:55:48 +0200 |
|---|---|---|
| committer | unknown <bell@desktop.sanja.is.com.ua> | 2007-02-02 13:55:48 +0200 |
| commit | 199ea756a6feed8c1db5c57ebb13fb7afaa77d98 (patch) | |
| tree | 2ca209398eaa2f6a593245724591c52ef0a974f4 /mysys/mf_keycache.c | |
| parent | 7412f0fa0cd498f06fe04966a6f6161e8b32d0a2 (diff) | |
| parent | 025400922118f11a15be54c66455f20e2f72c0b4 (diff) | |
| download | mariadb-git-199ea756a6feed8c1db5c57ebb13fb7afaa77d98.tar.gz | |
Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria
into desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria-pagecache
mysys/Makefile.am:
Auto merged
mysys/mf_keycache.c:
Auto merged
storage/maria/Makefile.am:
Auto merged
storage/maria/unittest/ma_control_file-t.c:
Auto merged
storage/maria/unittest/mf_pagecache_consist.c:
Auto merged
storage/maria/unittest/mf_pagecache_single.c:
Auto merged
storage/maria/unittest/test_file.h:
Auto merged
include/pagecache.h:
merge
mysys/mf_pagecache.c:
merge
storage/maria/maria_def.h:
merge
storage/maria/unittest/Makefile.am:
merge
unittest/mysys/Makefile.am:
merge
Diffstat (limited to 'mysys/mf_keycache.c')
| -rw-r--r-- | mysys/mf_keycache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 7c9aa80414b..07935904aac 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -1008,12 +1008,12 @@ static void unlink_block(KEY_CACHE *keycache, BLOCK_LINK *block) KEYCACHE_THREAD_TRACE("unlink_block"); #if defined(KEYCACHE_DEBUG) + KEYCACHE_DBUG_ASSERT(keycache->blocks_available != 0); keycache->blocks_available--; KEYCACHE_DBUG_PRINT("unlink_block", ("unlinked block %u status=%x #requests=%u #available=%u", BLOCK_NUMBER(block), block->status, block->requests, keycache->blocks_available)); - KEYCACHE_DBUG_ASSERT(keycache->blocks_available >= 0); #endif } |