Updated mysql-server to 4.0.18

* Bug fixes

10 files changed, 51 insertions, 49 deletions

diff --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile
index 4cc8df440a8..5300dd3ec1b 100644
--- a/databases/mysql4-server/Makefile
+++ b/databases/mysql4-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/20 16:00:42 martti Exp $
+# $NetBSD: Makefile,v 1.2 2004/03/07 19:42:55 martti Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 SVR4_PKGNAME=		mysqs
@@ -34,6 +34,7 @@ post-configure:
 	cd ${WRKSRC} && ${CP} -f config.h include/my_config.h
 
 post-build:
+	cd ${WRKSRC}/man && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
 	cd ${WRKSRC}/scripts && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}	\
 		${MAKE_FLAGS} mysqld_safe mysql_install_db
 
@@ -43,7 +44,7 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/support-files/mysql.server ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/mysqld.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/man/mysqld_multi.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/man/mysqld_safe.1 ${PREFIX}/man/man1
+	#${INSTALL_MAN} ${WRKSRC}/man/mysqld_safe.1 ${PREFIX}/man/man1
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 	${CHOWN} -R ${MYSQL_USER}:${MYSQL_GROUP} ${MYSQL_DATADIR}
 
diff --git a/databases/mysql4-server/PLIST b/databases/mysql4-server/PLIST
index 92dd77f2eac..ef60185548a 100644
--- a/databases/mysql4-server/PLIST
+++ b/databases/mysql4-server/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/20 16:00:42 martti Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/03/07 19:42:55 martti Exp $
 bin/comp_err
 bin/isamchk
 bin/isamlog
 bin/my_print_defaults
+bin/myisam_ftdump
 bin/myisamchk
 bin/myisamlog
 bin/myisampack
@@ -29,7 +30,7 @@ lib/mysql/libvio.a
 libexec/mysqld
 man/man1/mysqld.1
 man/man1/mysqld_multi.1
-man/man1/mysqld_safe.1
+@comment man/man1/mysqld_safe.1
 share/mysql/charsets/Index
 share/mysql/charsets/README
 share/mysql/charsets/cp1251.conf
diff --git a/databases/mysql4-server/distinfo b/databases/mysql4-server/distinfo
index 4dcf98bacd4..1b4b41f827c 100644
--- a/databases/mysql4-server/distinfo
+++ b/databases/mysql4-server/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.2 2004/02/24 14:53:54 grant Exp $
+$NetBSD: distinfo,v 1.3 2004/03/07 19:42:55 martti Exp $
 
-SHA1 (mysql-4.0.17.tar.gz) = b2588d2ccc9d2683e874e7c5cb4d9c55c2196b9e
-Size (mysql-4.0.17.tar.gz) = 12959051 bytes
-SHA1 (patch-aa) = fac3a4b96d32c4022d459b042c1f40b393a2719f
+SHA1 (mysql-4.0.18.tar.gz) = 101f199faead0d22d2da2b1ac82b8c071aa987a8
+Size (mysql-4.0.18.tar.gz) = 13422686 bytes
+SHA1 (patch-aa) = 3c10d0921336b5f7aea5033c3d4a33d3e11a894e
 SHA1 (patch-ae) = d5dcade3dea37c2f9be12bbddf6091ddb57344ac
-SHA1 (patch-af) = 87b5682c33ef2a05a0958ccacba7038273f66bca
+SHA1 (patch-af) = 038b5d570265e1f821de6502d05f94225eba5672
 SHA1 (patch-al) = 725a3a6e06d39b26efb706bebbe3ff95da82be96
-SHA1 (patch-am) = 822bad2bcfd94e0277c28ff31a84b6af770a0806
-SHA1 (patch-aq) = 9b3612a95f4409dc062951fbc2636df63d7b7998
-SHA1 (patch-ar) = dfb126a4cca3bb6fd06608222277ed8773b3d34d
-SHA1 (patch-as) = 3e2266ce1942715a21ae1e686b162c198811fb49
-SHA1 (patch-at) = 459e33b9e06f3ffc78d5dfc7e43068eb10e21b0d
+SHA1 (patch-am) = 3c49714de59d5c51bd6f4c8634333d53d22b5ae0
+SHA1 (patch-aq) = 1e09f64374ebc3a9ee4cad2a8f6d7b11ba4b0451
+SHA1 (patch-ar) = 9b847ea353618d4133713999c8dff407b40a769e
+SHA1 (patch-as) = c1f61c4f02d89fc5e89617a063f7ea1b0fa438d6
+SHA1 (patch-at) = 3a457c3f6b13312cb71b663108abd0ace09f2be4
 SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91
 SHA1 (patch-av) = 6ea5b9338d223f1380386288c537f55d4fd7a7d7
diff --git a/databases/mysql4-server/patches/patch-aa b/databases/mysql4-server/patches/patch-aa
index 9f603af02df..8392346114e 100644
--- a/databases/mysql4-server/patches/patch-aa
+++ b/databases/mysql4-server/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/12/20 16:00:42 martti Exp $
+$NetBSD: patch-aa,v 1.2 2004/03/07 19:42:55 martti Exp $
 
---- Makefile.in.orig	2003-12-14 21:24:01.000000000 +0000
-+++ Makefile.in	2003-12-20 12:08:19.000000000 +0000
-@@ -210,11 +210,8 @@
+--- Makefile.in.orig	Tue Feb 10 20:16:48 2004
++++ Makefile.in	Sun Mar  7 20:20:06 2004
+@@ -277,11 +277,8 @@
  
  # These are built from source in the Docs directory
  EXTRA_DIST = INSTALL-SOURCE README COPYING 
diff --git a/databases/mysql4-server/patches/patch-af b/databases/mysql4-server/patches/patch-af
index 32a3c9f7bca..72abf738fe0 100644
--- a/databases/mysql4-server/patches/patch-af
+++ b/databases/mysql4-server/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $
+$NetBSD: patch-af,v 1.2 2004/03/07 19:42:55 martti Exp $
 
---- configure.orig	2003-12-14 21:24:06.000000000 +0000
-+++ configure	2003-12-20 12:09:09.000000000 +0000
-@@ -20886,27 +20886,11 @@
+--- configure.orig	Tue Feb 10 20:16:56 2004
++++ configure	Sun Mar  7 20:20:28 2004
+@@ -32023,27 +32023,11 @@
  
  echo "$as_me:$LINENO: checking for ORBit" >&5
  echo $ECHO_N "checking for ORBit... $ECHO_C" >&6
@@ -30,7 +30,7 @@ $NetBSD: patch-af,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $
  
  
  
-@@ -21140,7 +21124,6 @@
+@@ -32277,7 +32261,6 @@
  else
    bench_dirs=""
  fi
diff --git a/databases/mysql4-server/patches/patch-am b/databases/mysql4-server/patches/patch-am
index 96a46dac781..6dc5fc9d07e 100644
--- a/databases/mysql4-server/patches/patch-am
+++ b/databases/mysql4-server/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $
+$NetBSD: patch-am,v 1.2 2004/03/07 19:42:55 martti Exp $
 
---- scripts/mysqld_safe.sh.orig	Tue Nov 25 10:11:07 2003
-+++ scripts/mysqld_safe.sh	Tue Nov 25 10:16:51 2003
-@@ -251,6 +251,14 @@
+--- scripts/mysqld_safe.sh.orig	Sun Mar  7 20:19:31 2004
++++ scripts/mysqld_safe.sh	Sun Mar  7 20:20:59 2004
+@@ -257,6 +257,14 @@
    fi
  fi
  
@@ -17,7 +17,7 @@ $NetBSD: patch-am,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $
  #
  # If there exists an old pid file, check if the daemon is already running
  # Note: The switches to 'ps' may depend on your operating system
-@@ -261,18 +269,16 @@
+@@ -267,18 +275,16 @@
    then
      if @FIND_PROC@
      then    # The pid contains a mysqld process
@@ -40,7 +40,7 @@ $NetBSD: patch-am,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $
      exit 1
    fi
  fi
-@@ -285,11 +291,11 @@
+@@ -291,11 +297,11 @@
  # Alternatively, you can start mysqld with the "myisam-recover" option. See
  # the manual for details.
  #
@@ -54,7 +54,7 @@ $NetBSD: patch-am,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $
  
  # Does this work on all systems?
  #if type ulimit | grep "shell builtin" > /dev/null
-@@ -297,7 +303,7 @@
+@@ -303,7 +309,7 @@
  #  ulimit -n 256 > /dev/null 2>&1		# Fix for BSD and FreeBSD systems
  #fi
  
@@ -63,7 +63,7 @@ $NetBSD: patch-am,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $
  while true
  do
    rm -f $safe_mysql_unix_port $pid_file	# Some extra safety
-@@ -320,7 +326,7 @@
+@@ -326,7 +332,7 @@
      # The only thing is ps x => redhat 5 gives warnings when using ps -x.
      # kill -9 is used or the process won't react on the kill.
      numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD`
@@ -72,7 +72,7 @@ $NetBSD: patch-am,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $
      I=1
      while test "$I" -le "$numofproces"
      do 
-@@ -332,15 +338,14 @@
+@@ -338,15 +344,14 @@
  	#    echo "TEST $I - $T **"
  	if kill -9 $T
  	then
diff --git a/databases/mysql4-server/patches/patch-aq b/databases/mysql4-server/patches/patch-aq
index b4ca2622c01..e9147936f5a 100644
--- a/databases/mysql4-server/patches/patch-aq
+++ b/databases/mysql4-server/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $
+$NetBSD: patch-aq,v 1.2 2004/03/07 19:42:55 martti Exp $
 
---- include/Makefile.in.orig	Mon Oct 13 17:24:51 2003
-+++ include/Makefile.in	Mon Oct 13 17:30:05 2003
-@@ -205,13 +205,8 @@
+--- include/Makefile.in.orig	Tue Feb 10 20:16:49 2004
++++ include/Makefile.in	Sun Mar  7 20:21:23 2004
+@@ -272,13 +272,8 @@
  vio_dir = @vio_dir@
  vio_libs = @vio_libs@
  
diff --git a/databases/mysql4-server/patches/patch-ar b/databases/mysql4-server/patches/patch-ar
index 717ed5213aa..4b1208d7cd5 100644
--- a/databases/mysql4-server/patches/patch-ar
+++ b/databases/mysql4-server/patches/patch-ar
@@ -1,8 +1,8 @@
-$NetBSD: patch-ar,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $
+$NetBSD: patch-ar,v 1.2 2004/03/07 19:42:55 martti Exp $
 
---- man/Makefile.in.orig	Mon Oct 13 17:44:31 2003
-+++ man/Makefile.in	Mon Oct 13 17:44:50 2003
-@@ -207,7 +207,7 @@
+--- man/Makefile.in.orig	Tue Feb 10 20:16:50 2004
++++ man/Makefile.in	Sun Mar  7 20:21:42 2004
+@@ -274,7 +274,7 @@
  
  man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \
  		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
@@ -10,4 +10,4 @@ $NetBSD: patch-ar,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $
 +		perror.1 replace.1 mysql_fix_privilege_tables.1
  
  
- EXTRA_DIST = $(man_MANS)
+ EXTRA_DIST = mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \
diff --git a/databases/mysql4-server/patches/patch-as b/databases/mysql4-server/patches/patch-as
index 42d9706b3e9..43de2ef0c2b 100644
--- a/databases/mysql4-server/patches/patch-as
+++ b/databases/mysql4-server/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $
+$NetBSD: patch-as,v 1.2 2004/03/07 19:42:55 martti Exp $
 
---- support-files/Makefile.in.orig	Mon Oct 13 17:48:34 2003
-+++ support-files/Makefile.in	Mon Oct 13 17:50:44 2003
-@@ -219,15 +219,7 @@
+--- support-files/Makefile.in.orig	Tue Feb 10 20:16:54 2004
++++ support-files/Makefile.in	Sun Mar  7 20:22:01 2004
+@@ -286,15 +286,7 @@
  
  SUBDIRS = MacOSX
  
diff --git a/databases/mysql4-server/patches/patch-at b/databases/mysql4-server/patches/patch-at
index f501015e1d0..ef0127e9b69 100644
--- a/databases/mysql4-server/patches/patch-at
+++ b/databases/mysql4-server/patches/patch-at
@@ -1,8 +1,8 @@
-$NetBSD: patch-at,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $
+$NetBSD: patch-at,v 1.2 2004/03/07 19:42:55 martti Exp $
 
---- support-files/MacOSX/Makefile.in.orig	Mon Oct 13 17:53:21 2003
-+++ support-files/MacOSX/Makefile.in	Mon Oct 13 17:53:55 2003
-@@ -217,11 +217,7 @@
+--- support-files/MacOSX/Makefile.in.orig	Tue Feb 10 20:16:53 2004
++++ support-files/MacOSX/Makefile.in	Sun Mar  7 20:22:21 2004
+@@ -284,11 +284,7 @@
  		StartupItem.postinstall