Commit 9e1a6b0e authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0-maint 

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
parents 1878b9f6 66b6357e

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -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
@@ -1946,7 +1946,7 @@ esac 


# isinf() could be a function or a macro (HPUX)

AC_MSG_CHECKING(for isinf with <math.h>)

AC_TRY_LINK([#include <math.h>], [float f = 0.0; isinf(f)],

AC_TRY_LINK([#include <math.h>], [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))

include/my_global.h

+1 −1
Original line number Diff line number Diff line
@@ -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

ndb/include/ndb_global.h.in

+0 −4
Original line number Diff line number Diff line
@@ -128,12 +128,8 @@ extern "C" { 


#include "ndb_init.h"



#ifdef SCO



#ifndef PATH_MAX

#define PATH_MAX 1024

#endif



#endif /* SCO */



#endif

tests/Makefile.am

+3 −6
Original line number Diff line number Diff line
@@ -43,14 +43,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)