Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community--bug23294

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint


configure.in:
  Manual merge.
This commit is contained in:
unknown 2007-04-21 09:42:18 -04:00
commit 5fc9315158

View file

@ -450,7 +450,7 @@ then
FIND_PROC="$PS \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
else
case $SYSTEM_TYPE in
*freebsd*)
*freebsd*|*dragonfly*)
FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
;;
*darwin*)
@ -994,7 +994,7 @@ case $SYSTEM_TYPE in
MAX_C_OPTIMIZE="-O"
fi
;;
*freebsd*)
*freebsd*|*dragonfly*)
AC_MSG_WARN([Adding fix for interrupted reads])
OSVERSION=`sysctl -a | grep osreldate | awk '{ print $2 }'`
if test "$OSVERSION" -gt "480100" && \