Commit 91a1db9d authored by unknown's avatar unknown
Browse files

Merge shellback.(none):/home/msvensson/mysql/work/my51-work 

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
parents 8e76d8e8 607e99d0

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -420,7 +420,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
@@ -1861,7 +1861,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))

storage/ndb/include/ndb_global.h.in

+0 −4
Original line number Diff line number Diff line
@@ -129,14 +129,10 @@ extern "C" { 


#include "ndb_init.h"



#ifdef SCO



#ifndef PATH_MAX

#define PATH_MAX 1024

#endif



#endif /* SCO */



#ifndef MIN

#define MIN(x,y) (((x)<(y))?(x):(y))

#endif