diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2009-10-08 21:58:17 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2009-10-08 21:58:17 +0200 |
| commit | 33b4ba995061d2b3d24c68414e505a43dbd52ebb (patch) | |
| tree | 24c9aa58a23e0883c95aca4e219fa8a5767bf2e0 | |
| parent | fd04391340e9480857e0a31426cdefea21b5a036 (diff) | |
| download | mariadb-git-33b4ba995061d2b3d24c68414e505a43dbd52ebb.tar.gz | |
Fix bug#47923 New "mf_keycache.c" requires thread support
The bug is a compilation issue:
Function "find_key_block()" had thread operations
which were not guarded by "#if THREAD", add that now.
mysys/mf_keycache.c:
Without thread-support, we are in a single-threaded world,
so there is no parallelism, and the keycache cannot be
within a resize operation while this request is being processed.
| -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 3c11e6731b7..6ffa8fb3ea8 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -1742,6 +1742,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 */ @@ -1983,6 +1984,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 | |