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
This commit is contained in:
commit
a602c2c78e
@ -450,7 +450,7 @@ then
|
|||||||
FIND_PROC="$PS \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
|
FIND_PROC="$PS \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
|
||||||
else
|
else
|
||||||
case $SYSTEM_TYPE in
|
case $SYSTEM_TYPE in
|
||||||
*freebsd*)
|
*freebsd*|*dragonfly*)
|
||||||
FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
|
FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
|
||||||
;;
|
;;
|
||||||
*darwin*)
|
*darwin*)
|
||||||
@ -994,7 +994,7 @@ case $SYSTEM_TYPE in
|
|||||||
MAX_C_OPTIMIZE="-O"
|
MAX_C_OPTIMIZE="-O"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
*freebsd*)
|
*freebsd*|*dragonfly*)
|
||||||
AC_MSG_WARN([Adding fix for interrupted reads])
|
AC_MSG_WARN([Adding fix for interrupted reads])
|
||||||
OSVERSION=`sysctl -a | grep osreldate | awk '{ print $2 }'`
|
OSVERSION=`sysctl -a | grep osreldate | awk '{ print $2 }'`
|
||||||
if test "$OSVERSION" -gt "480100" && \
|
if test "$OSVERSION" -gt "480100" && \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user