diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-19 17:28:31 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-19 17:28:31 +0400 |
| commit | 03bf73de2fc2df414cafff03c8aaf3a58a3e7e48 (patch) | |
| tree | e10df06a55f0a2e5791792f832e0cab38bf70b99 /mysys | |
| parent | b76ccb1276835c579a3aacc4c2c7884e0ffd0529 (diff) | |
| parent | edb40a05a13e86c28f90159a4d2df6675348cb84 (diff) | |
| download | mariadb-git-03bf73de2fc2df414cafff03c8aaf3a58a3e7e48.tar.gz | |
Merge from mysql-5.1.
Diffstat (limited to 'mysys')
| -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 7bb5ff594d5..139a61da1f0 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -1730,6 +1730,7 @@ restart: - block assigned but not yet read from file (invalid data). */ +#ifdef THREAD if (keycache->in_resize) { /* This is a request during a resize operation */ @@ -1971,6 +1972,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 | |