diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2009-10-09 15:21:45 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2009-10-09 15:21:45 +0200 |
| commit | 7a69adf4928c7bc46dca09f103bd1f93656c5ce0 (patch) | |
| tree | a9e71e46d5992a103a62ef5aa43325950ba5a29b | |
| parent | 5f8cfacf6c6e4b74c8825c47fa9acdf2fae8f396 (diff) | |
| parent | 5184530308466e83b8a77c35e05201778cdc6827 (diff) | |
| download | mariadb-git-7a69adf4928c7bc46dca09f103bd1f93656c5ce0.tar.gz | |
Upmerge (automerge) into 5.1
| -rw-r--r-- | mysys/mf_keycache.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 9bfdef82337..64d0ea98427 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -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 | |