Also commit patches for the DragonFly support.

This commit is contained in:
joerg 2005-10-26 17:33:49 +00:00
parent d3732c607e
commit 0760a6b42a
7 changed files with 102 additions and 0 deletions

View file

@ -0,0 +1,13 @@
$NetBSD: patch-aa,v 1.1 2005/10/26 17:33:49 joerg Exp $
--- mysys/my_gethwaddr.c.orig 2005-10-14 10:21:10.000000000 +0000
+++ mysys/my_gethwaddr.c
@@ -31,7 +31,7 @@ static my_bool memcpy_and_test(uchar *to
return res;
}
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__DragonFly__)
#include <net/ethernet.h>
#include <sys/sysctl.h>

View file

@ -0,0 +1,13 @@
$NetBSD: patch-ab,v 1.1 2005/10/26 17:33:49 joerg Exp $
--- sql/mysqld.cc.orig 2005-10-14 10:21:12.000000000 +0000
+++ sql/mysqld.cc
@@ -182,7 +182,7 @@ static void getvolumeID(BYTE *volumeName
int initgroups(const char *,unsigned int);
#endif
-#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H)
+#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(HAVE_IEEEFP_H)
#include <ieeefp.h>
#ifdef HAVE_FP_EXCEPT // Fix type conflict
typedef fp_except fp_except_t;

View file

@ -0,0 +1,13 @@
$NetBSD: patch-ac,v 1.1 2005/10/26 17:33:49 joerg Exp $
--- vio/vio.c.orig 2005-10-14 10:23:58.000000000 +0000
+++ vio/vio.c
@@ -132,7 +132,7 @@ Vio *vio_new(my_socket sd, enum enum_vio
vio->sd);
#if !defined(__WIN__) && !defined(__EMX__) && !defined(OS2)
#if !defined(NO_FCNTL_NONBLOCK)
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
fcntl(sd, F_SETFL, vio->fcntl_mode); /* Yahoo! FreeBSD patch */
#endif
vio->fcntl_mode = fcntl(sd, F_GETFL);

View file

@ -0,0 +1,24 @@
$NetBSD: patch-ad,v 1.1 2005/10/26 17:33:49 joerg Exp $
--- configure.orig 2005-10-14 10:25:05.000000000 +0000
+++ configure
@@ -21053,7 +21053,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*)
@@ -25265,6 +25265,10 @@ case $SYSTEM_TYPE in
MAX_C_OPTIMIZE="-O"
fi
;;
+ *dragonfly*)
+ CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
+ ;;
+
*freebsd*)
echo "Adding fix for interrupted reads"
OSVERSION=`sysctl -a | grep osreldate | awk '{ print $2 }'`

View file

@ -0,0 +1,13 @@
$NetBSD: patch-ad,v 1.1 2005/10/26 17:33:49 joerg Exp $
--- sql/mysqld.cc.orig 2005-10-14 10:21:12.000000000 +0000
+++ sql/mysqld.cc
@@ -182,7 +182,7 @@ static void getvolumeID(BYTE *volumeName
int initgroups(const char *,unsigned int);
#endif
-#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H)
+#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(HAVE_IEEEFP_H)
#include <ieeefp.h>
#ifdef HAVE_FP_EXCEPT // Fix type conflict
typedef fp_except fp_except_t;

View file

@ -0,0 +1,13 @@
$NetBSD: patch-ae,v 1.3 2005/10/26 17:33:49 joerg Exp $
--- mysys/my_gethwaddr.c.orig 2005-10-14 10:21:10.000000000 +0000
+++ mysys/my_gethwaddr.c
@@ -31,7 +31,7 @@ static my_bool memcpy_and_test(uchar *to
return res;
}
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__DragonFly__)
#include <net/ethernet.h>
#include <sys/sysctl.h>

View file

@ -0,0 +1,13 @@
$NetBSD: patch-ag,v 1.1 2005/10/26 17:33:49 joerg Exp $
--- vio/vio.c.orig 2005-10-14 10:23:58.000000000 +0000
+++ vio/vio.c
@@ -132,7 +132,7 @@ Vio *vio_new(my_socket sd, enum enum_vio
vio->sd);
#if !defined(__WIN__) && !defined(__EMX__) && !defined(OS2)
#if !defined(NO_FCNTL_NONBLOCK)
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
fcntl(sd, F_SETFL, vio->fcntl_mode); /* Yahoo! FreeBSD patch */
#endif
vio->fcntl_mode = fcntl(sd, F_GETFL);