Commit a602c2c7 authored by cmiller@zippy.cornsilk.net's avatar cmiller@zippy.cornsilk.net

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
parents bd313226 d67f0cb8
...@@ -450,7 +450,7 @@ then ...@@ -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 ...@@ -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" && \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment