From 5184530308466e83b8a77c35e05201778cdc6827 Mon Sep 17 00:00:00 2001 From: Joerg Bruehe Date: Thu, 8 Oct 2009 21:58:17 +0200 Subject: [PATCH 1/2] 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 | 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 0f1547a0ab09b6e470d2b9f690015a99c6b7c682 Mon Sep 17 00:00:00 2001 From: Joerg Bruehe Date: Fri, 9 Oct 2009 21:31:37 +0200 Subject: [PATCH 2/2] Fix Bug #47957 A build "--without-server" fails if using "--with-ssl" (YaSSL) The problem was the lack of directory "extra" in a build which did not include the server. --- configure.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index 3e43a5f5779..82335e2c3fd 100644 --- a/configure.in +++ b/configure.in @@ -2769,7 +2769,7 @@ server_scripts= dnl This probably should be cleaned up more - for now the threaded dnl client is just using plain-old libs. -sql_client_dirs="strings regex mysys dbug libmysql" +sql_client_dirs="strings mysys dbug extra regex libmysql" AM_CONDITIONAL(THREAD_SAFE_CLIENT, test "$THREAD_SAFE_CLIENT" != "no") @@ -2835,9 +2835,10 @@ AC_SUBST(mysql_plugin_defs) # Now that sql_client_dirs and sql_server_dirs are stable, determine the union. -# Start with the (longer) server list, add each client item not yet present. -sql_union_dirs=" $sql_server_dirs " -for DIR in $sql_client_dirs +# We support client-only builds by "--without-server", but not vice versa, +# so we start with the client list, then add each server item not yet present. +sql_union_dirs=" $sql_client_dirs " +for DIR in $sql_server_dirs do if echo " $sql_union_dirs " | grep " $DIR " >/dev/null then