From 33b4ba995061d2b3d24c68414e505a43dbd52ebb Mon Sep 17 00:00:00 2001 From: Joerg Bruehe Date: Thu, 8 Oct 2009 21:58:17 +0200 Subject: [PATCH 1/3] 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. --- mysys/mf_keycache.c | 4 ++++ 1 file changed, 4 insertions(+) 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 | From 903d21287c835fa76cd3eac7b00276b5195eda3a Mon Sep 17 00:00:00 2001 From: Georgi Kodinov Date: Wed, 14 Oct 2009 18:44:22 +0300 Subject: [PATCH 2/3] version change --- .bzr-mysql/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bzr-mysql/default.conf b/.bzr-mysql/default.conf index f79c1cd6319..557df1b1ffe 100644 --- a/.bzr-mysql/default.conf +++ b/.bzr-mysql/default.conf @@ -1,4 +1,4 @@ [MYSQL] post_commit_to = "commits@lists.mysql.com" post_push_to = "commits@lists.mysql.com" -tree_name = "mysql-5.0" +tree_name = "mysql-5.0-bugteam" From 4bebf043542d3872545caacbe3bae634bc450083 Mon Sep 17 00:00:00 2001 From: Joerg Bruehe Date: Fri, 16 Oct 2009 14:06:33 +0200 Subject: [PATCH 3/3] Compile fix for Windows: Use "#ifdef", not plain "#if". --- mysys/mf_keycache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 6ffa8fb3ea8..53a3be6f999 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -1742,7 +1742,7 @@ restart: - block assigned but not yet read from file (invalid data). */ -#if THREAD +#ifdef THREAD if (keycache->in_resize) { /* This is a request during a resize operation */