1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 5.0-bugteam (compile fix) into main 5.0

Browse Source
This commit is contained in:
Joerg Bruehe 2009-10-16 14:29:41 +02:00
commit ce0a06935b
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysys/mf_keycache.c
View File

@ -1742,6 +1742,7 @@ restart:
- block assigned but not yet read from file (invalid data). - block assigned but not yet read from file (invalid data).
*/ */
#ifdef THREAD
if (keycache->in_resize) if (keycache->in_resize)
{ {
/* This is a request during a resize operation */ /* This is a request during a resize operation */
@ -1983,6 +1984,9 @@ restart:
} }
DBUG_RETURN(0); DBUG_RETURN(0);
} }
#else /* THREAD */
DBUG_ASSERT(!keycache->in_resize);
#endif
if (page_status == PAGE_READ && if (page_status == PAGE_READ &&
(block->status & (BLOCK_IN_EVICTION | BLOCK_IN_SWITCH | (block->status & (BLOCK_IN_EVICTION | BLOCK_IN_SWITCH |