From ef83979a354a20040508485189031cedb54a0fac Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 15 Sep 2005 14:53:38 +0200 Subject: [PATCH 1/2] - bumped up version number from 5.0.13-beta to 5.0.13-rc - tagged this ChangeSet as "clone-5.0.13-build" --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 05aaaa73bfa..708dba787ff 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! # remember to also change ndb version below and update version.c in ndb -AM_INIT_AUTOMAKE(mysql, 5.0.13-beta) +AM_INIT_AUTOMAKE(mysql, 5.0.13-rc) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 @@ -19,7 +19,7 @@ SHARED_LIB_VERSION=15:0:0 NDB_VERSION_MAJOR=5 NDB_VERSION_MINOR=0 NDB_VERSION_BUILD=13 -NDB_VERSION_STATUS="beta" +NDB_VERSION_STATUS="rc" # Set all version vars based on $VERSION. How do we do this more elegant ? # Remember that regexps needs to quote [ and ] since this is run through m4 From f7bcd099f5c421c85f4485a908dfe83708ff213d Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 15 Sep 2005 19:00:25 +0200 Subject: [PATCH 2/2] Compile problem about "madvise()" on Solaris (bug#7156). (Patch supplied by Kent) --- include/my_global.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/my_global.h b/include/my_global.h index 5bfcef2820f..48dd165dba1 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -107,6 +107,14 @@ #define _GNU_SOURCE 1 #endif +/* + Temporary solution to solve bug#7156. Include "sys/types.h" before + the thread headers, else the function madvise() will not be defined +*/ +#if defined(HAVE_SYS_TYPES_H) && ( defined(sun) || defined(__sun) ) +#include +#endif + /* The client defines this to avoid all thread code */ #if defined(UNDEF_THREADS_HACK) #undef THREAD