Commit f359b258 authored by Joerg Bruehe's avatar Joerg Bruehe

Merge 5.0-bugteam (compile fix) into main 5.0

parents b251cbd5 11d4eb35
......@@ -1742,6 +1742,7 @@ static BLOCK_LINK *find_key_block(KEY_CACHE *keycache,
- block assigned but not yet read from file (invalid data).
*/
#ifdef THREAD
if (keycache->in_resize)
{
/* This is a request during a resize operation */
......@@ -1983,6 +1984,9 @@ static BLOCK_LINK *find_key_block(KEY_CACHE *keycache,
}
DBUG_RETURN(0);
}
#else /* THREAD */
DBUG_ASSERT(!keycache->in_resize);
#endif
if (page_status == PAGE_READ &&
(block->status & (BLOCK_IN_EVICTION | BLOCK_IN_SWITCH |
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment