Commit 7a69adf4 authored by Joerg Bruehe's avatar Joerg Bruehe

Upmerge (automerge) into 5.1

parents 5f8cfacf 51845303
......@@ -1729,6 +1729,7 @@ restart:
- block assigned but not yet read from file (invalid data).
*/
#if THREAD
if (keycache->in_resize)
{
/* This is a request during a resize operation */
......@@ -1970,6 +1971,9 @@ restart:
}
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