Commit 796f5e00 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/M40/clone-4.0 into mysql.com:/M40/upward-4.0 


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
parents 1f776a5a a46d6b0c

configure.in

+10 −7
Original line number Diff line number Diff line
@@ -447,30 +447,33 @@ PS=$ac_cv_path_PS 
# Linux style

if $PS p $$ 2> /dev/null | grep $0 > /dev/null

then

  FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null"

  FIND_PROC="$PS p \$\$PID | grep -v grep | grep mysqld > /dev/null"

# Solaris

elif $PS -fp $$ 2> /dev/null | grep $0 > /dev/null

then

  FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null"

  FIND_PROC="$PS -p \$\$PID | grep -v grep | grep mysqld > /dev/null"

# BSD style

elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null

then

  FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"

  FIND_PROC="$PS -uaxww | grep -v grep | grep mysqld | grep \" \$\$PID \" > /dev/null"

# SysV style

elif $PS -ef 2> /dev/null | grep $0 > /dev/null

then

  FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null"

  FIND_PROC="$PS -ef | grep -v grep | grep mysqld | grep \" \$\$PID \" > /dev/null"

# Do anybody use this?

elif $PS $$ 2> /dev/null | grep $0 > /dev/null

then

  FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null"

  FIND_PROC="$PS \$\$PID | grep -v grep | grep mysqld > /dev/null"

else

  case $SYSTEM_TYPE in

    *freebsd*)

      FIND_PROC="$PS p \$\$PID | grep -v grep | grep mysqld > /dev/null"

      ;;

    *darwin*)

      FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"

      FIND_PROC="$PS -uaxww | grep -v grep | grep mysqld | grep \" \$\$PID \" > /dev/null"

      ;;

    *cygwin*)

      FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"

      FIND_PROC="$PS -e | grep -v grep | grep mysqld | grep \" \$\$PID \" > /dev/null"

      ;;

    *netware* | *modesto*)

      FIND_PROC=

include/my_global.h

+5 −0
Original line number Diff line number Diff line
@@ -297,6 +297,11 @@ C_MODE_END 
#undef  HAVE_FINITE

#undef  LONGLONG_MIN            /* These get wrongly defined in QNX 6.2 */

#undef  LONGLONG_MAX            /* standard system library 'limits.h' */

#ifdef __cplusplus

#define HAVE_RINT               /* rint() and isnan() functions are not */

#define rint(a) std::rint(a)    /* visible in C++ scope due to an error */

#define isnan(a) std::isnan(a)  /* in the usr/include/math.h on QNX     */

#endif

#endif



/* We can not live without the following defines */