Attachment 33437 Details for Bug 54780 – mysql40.diff

[patch] mysql40.diff

mysql40.diff (text/plain), 2.16 KB, created by Alex Dupre on 2003-07-23 11:50:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Dupre

Created: 2003-07-23 11:50:20 UTC

Size: 2.16 KB

patch

obsolete

>diff -ruN mysql40-server.orig/Makefile mysql40-server/Makefile
>--- mysql40-server.orig/Makefile	Wed Jul 23 10:11:48 2003
>+++ mysql40-server/Makefile	Wed Jul 23 11:26:43 2003
>@@ -6,8 +6,8 @@
> #
> 
> PORTNAME?=	mysql
>-PORTVERSION=	4.0.13
>-PORTREVISION?=	1
>+PORTVERSION=	4.0.14
>+PORTREVISION?=	0
> CATEGORIES=	databases
> MASTER_SITES=	ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \
> 		http://mysql.tzone.it/Downloads/MySQL-4.0/ \
>@@ -163,7 +163,7 @@
> .else
> MAN1=		isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1  \
> 		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \
>-		mysqlshow.1 perror.1 replace.1
>+		mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1
> 
> INSTALLS_SHLIB=	yes
> LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
>diff -ruN mysql40-server.orig/distinfo mysql40-server/distinfo
>--- mysql40-server.orig/distinfo	Wed Jul 23 10:11:48 2003
>+++ mysql40-server/distinfo	Wed Jul 23 10:20:09 2003
>@@ -1 +1 @@
>-MD5 (mysql-4.0.13.tar.gz) = 4bad6dae73f53c16bfcf41c704681059
>+MD5 (mysql-4.0.14.tar.gz) = 9764f09c89692345d3b7800ab014f822
>diff -ruN mysql40-server.orig/files/patch-configure mysql40-server/files/patch-configure
>--- mysql40-server.orig/files/patch-configure	Wed Jul 23 10:11:48 2003
>+++ mysql40-server/files/patch-configure	Wed Jul 23 11:26:53 2003
>@@ -61,25 +61,6 @@
>  
>  echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
>  echo "${ECHO_T}\"$FIND_PROC\"" >&6
>-@@ -12763,8 +12729,16 @@
>-     ;;
>-   *freebsd*)
>-     echo "Adding fix for interrupted reads"
>--    CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
>--    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
>-+    OSVERSION=`/sbin/sysctl -a | /usr/bin/grep osreldate | /usr/bin/awk '{ print $2 }'`
>-+    if test "$OSVERSION" -gt "480100" && \
>-+       test "$OSVERSION" -lt "500000" || \
>-+       test "$OSVERSION" -gt "500109"
>-+    then
>-+	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
>-+    else
>-+	CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
>-+	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
>-+    fi
>-     ;;
>-   *netbsd*)
>-     echo "Adding flag -Dunix"
> @@ -22320,7 +22294,7 @@
>  	/* ) rel_srcdir="$srcdir" ;;
>  	* )  rel_srcdir="../$srcdir" ;;

Actions: View | Diff

Attachments on bug 54780: 33437