From dd27607065f2f4f42cdc1203b872e4b6f67e0333 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 26 Jul 2006 15:27:53 +0200 Subject: [PATCH 1/5] Bug#16574 Patch to compile on GNU/Hurd (PATH_MAX limit not existing) - Define MAX_PATH if not already defined by system header files. - Thanks to Christian for the report and patch! ndb/include/ndb_global.h.in: PATH_MAX is defined in ndb_global.h for "sco", remove the conditional define for sco so it thakes effect as soon as MAX_PATH is not available --- ndb/include/ndb_global.h.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ndb/include/ndb_global.h.in b/ndb/include/ndb_global.h.in index 43f90e1f8b5..122b0edc400 100644 --- a/ndb/include/ndb_global.h.in +++ b/ndb/include/ndb_global.h.in @@ -128,12 +128,8 @@ extern "C" { #include "ndb_init.h" -#ifdef SCO - #ifndef PATH_MAX #define PATH_MAX 1024 #endif -#endif /* SCO */ - #endif From d6e4a75aafc3ee076a935161885ea5e367e5751c Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 26 Jul 2006 15:43:03 +0200 Subject: [PATCH 2/5] Bug#21222 Patch to support GNU/kFreeBSD build - Thanks to Christian Hammers for the patch! include/my_global.h: Define __GNU_SOURCE to 1 also when __GLIBC__ is defined --- include/my_global.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/my_global.h b/include/my_global.h index 909755aef87..4a9e1673de4 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -111,7 +111,7 @@ /* Fix problem with S_ISLNK() on Linux */ -#if defined(TARGET_OS_LINUX) +#if defined(TARGET_OS_LINUX) || defined(__GLIBC__) #undef _GNU_SOURCE #define _GNU_SOURCE 1 #endif From 17e310abc12e559d2eb4b0254aa5f88d7720cf4f Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 26 Jul 2006 16:00:11 +0200 Subject: [PATCH 3/5] Bug#16576 Patch to compile on GNU/Hurd (ps check in configure) - Thanks to Christian Hammers for the patch configure.in: The configure check on how to run ps to get mysqld's $PID does not work on the Hurd, as the PPID is prepended with a - for login shells, thus making grep look for -bash, which it complains as an invalid argument. Filtering out '-' from the ps output makes this work fine. --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index d4ee825a47f..f3c6ed70a2b 100644 --- a/configure.in +++ b/configure.in @@ -454,7 +454,7 @@ AC_PATH_PROG(PS, ps, ps) AC_MSG_CHECKING("how to check if pid exists") PS=$ac_cv_path_PS # Linux style -if $PS p $$ 2> /dev/null | grep $0 > /dev/null +if $PS p $$ 2> /dev/null | grep `echo $0 | sed s/\-//` > /dev/null then FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null" # Solaris From 80421c1b5fe88db57beaef1d3689ecb1386280bd Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 12 Sep 2006 11:34:46 +0200 Subject: [PATCH 4/5] Bug#22139 undefined reference to `my_memmem' when compiling tests/mysql_client_test - Build mysql_client_test from mysql_client_test.c and mysys/my_memmem.c tests/Makefile.am: Build mysql_client_test from mysql_client_test.c and mysys/my_memmem.c --- tests/Makefile.am | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index ab747d6e4ec..e1bc93f65b6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -42,14 +42,11 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ LIBS = @CLIENT_LIBS@ LDADD = @CLIENT_EXTRA_LDFLAGS@ \ $(top_builddir)/libmysql/libmysqlclient.la -if HAVE_NETWARE + mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix) \ - ../mysys/my_memmem.c -else -mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) -L../mysys -lmysys -mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix) -endif + $(top_srcdir)/mysys/my_memmem.c + insert_test_SOURCES= insert_test.c $(yassl_dummy_link_fix) select_test_SOURCES= select_test.c $(yassl_dummy_link_fix) insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) From acd9f1bd69211e6dc85ec1386514818f487210bd Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 12 Sep 2006 15:47:48 +0200 Subject: [PATCH 5/5] Bug#14862 undefined reference to `isinf' on SOLARIS - strings/strtod.c - Change the configure test looking for 'isinf' so the value returned from isinf is used. That avoids the call to isinf being optimized away. configure.in: Use the value returned from isinf so it's not optimized away by the compiler(i.e gcc 4.1) --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index b49dffcb59f..74aff4c6252 100644 --- a/configure.in +++ b/configure.in @@ -1946,7 +1946,7 @@ esac # isinf() could be a function or a macro (HPUX) AC_MSG_CHECKING(for isinf with ) -AC_TRY_LINK([#include ], [float f = 0.0; isinf(f)], +AC_TRY_LINK([#include ], [float f = 0.0; int r = isinf(f); return r], AC_MSG_RESULT(yes) AC_DEFINE(HAVE_ISINF, [1], [isinf() macro or function]), AC_MSG_RESULT(no))