From: Date: April 24 2007 4:46pm
Subject: bk commit into 5.1 tree (cmiller:1.2476)
List-Archive: http://lists.mysql.com/commits/25286
Message-Id: <20070424144646.232AF83051@zippy>

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-04-24 10:46:39-04:00, cmiller@stripped +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
  into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint
  MERGE: 1.2469.181.1

  configure.in@stripped, 2007-04-24 10:46:35-04:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.454.1.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.1-new-maint/RESYNC

--- 1.456/configure.in	2007-04-23 11:00:55 -04:00
+++ 1.457/configure.in	2007-04-24 10:46:35 -04:00
@@ -453,7 +453,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*)
@@ -997,7 +997,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" && \