branches/zip: buf_pool_drop_hash_index(): Check block->page.state

before checking block->is_hashed, because the latter may be uninitialized
right after server startup.
This commit is contained in:
marko 2010-01-13 15:15:29 +00:00
parent 844359b876
commit 0ccf7024db
2 changed files with 10 additions and 1 deletions

View file

@ -1,3 +1,10 @@
2010-01-13 The InnoDB Team
* buf/buf0buf.c:
When disabling the adaptive hash index, check the block state
before checking block->is_hashed, because the latter may be
uninitialized right after server startup.
2010-01-12 The InnoDB Team
* handler/ha_innodb.cc, handler/ha_innodb.h:

View file

@ -1058,7 +1058,9 @@ buf_pool_drop_hash_index(void)
when we have an x-latch on btr_search_latch;
see the comment in buf0buf.h */
if (!block->is_hashed) {
if (buf_block_get_state(block)
!= BUF_BLOCK_FILE_PAGE
|| !block->is_hashed) {
continue;
}