Update mysql4-client and mysql4-server to version 4.1.19.

Lots of changes since last packaged version (4.1.15), please see:
http://dev.mysql.com/doc/refman/4.1/en/news-4-1-19.html
http://dev.mysql.com/doc/refman/4.1/en/news-4-1-18.html
http://dev.mysql.com/doc/refman/4.1/en/news-4-1-17.html
http://dev.mysql.com/doc/refman/4.1/en/news-4-1-16.html

Most notably this version includes a fix for
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-1517

While here install more man pages and merge mysql4-client/patches/patch-ad
into mysql4-client/patches/patch-af.

10 files changed, 75 insertions, 99 deletions

diff --git a/databases/mysql4-client/Makefile b/databases/mysql4-client/Makefile
index 5615da7b1c0..02d9f6c30c5 100644
--- a/databases/mysql4-client/Makefile
+++ b/databases/mysql4-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2006/03/30 03:44:41 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/05/26 18:25:34 seb Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
-PKGREVISION=		1
 SVR4_PKGNAME=		mysqc
 COMMENT=		MySQL 4, a free SQL database (client)
 
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index 1a1a8544e36..77179d774b1 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.51 2006/04/22 09:22:07 rillig Exp $
+# $NetBSD: Makefile.common,v 1.52 2006/05/26 18:25:34 seb Exp $
 
-DISTNAME=		mysql-4.1.15
+DISTNAME=		mysql-4.1.19
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_MYSQL:=MySQL-4.1/}
 
diff --git a/databases/mysql4-client/PLIST b/databases/mysql4-client/PLIST
index 4f0fb1204e4..67e45e50d25 100644
--- a/databases/mysql4-client/PLIST
+++ b/databases/mysql4-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2006/03/30 03:44:42 jlam Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/05/26 18:25:34 seb Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_config
@@ -56,11 +56,15 @@ include/mysql/typelib.h
 info/mysql.info
 lib/mysql/libmysqlclient.la
 lib/mysql/libmysqlclient_r.la
+man/man1/msql2mysql.1
 man/man1/mysql.1
+man/man1/mysql_config.1
 man/man1/mysql_fix_privilege_tables.1
 man/man1/mysql_zap.1
 man/man1/mysqlaccess.1
 man/man1/mysqladmin.1
+man/man1/mysqlbinlog.1
+man/man1/mysqlcheck.1
 man/man1/mysqldump.1
 man/man1/mysqlshow.1
 share/examples/mysql/my-huge.cnf
diff --git a/databases/mysql4-client/distinfo b/databases/mysql4-client/distinfo
index bce4074ac3a..b03acf83e8f 100644
--- a/databases/mysql4-client/distinfo
+++ b/databases/mysql4-client/distinfo
@@ -1,17 +1,15 @@
-$NetBSD: distinfo,v 1.24 2005/10/29 14:14:00 xtraeme Exp $
+$NetBSD: distinfo,v 1.25 2006/05/26 18:25:34 seb Exp $
 
-SHA1 (mysql-4.1.15.tar.gz) = 04e275df6c538117eac9a5ba2ab56e5f01f69286
-RMD160 (mysql-4.1.15.tar.gz) = 07e0c3d5d206f9545cff145cb3ec8db4e395bff0
-Size (mysql-4.1.15.tar.gz) = 17257765 bytes
+SHA1 (mysql-4.1.19.tar.gz) = a1ceee918232891e795be3122ad88fed36c700d5
+RMD160 (mysql-4.1.19.tar.gz) = 8da54a0fa1f024237521de644af32821c6376fab
+Size (mysql-4.1.19.tar.gz) = 17349799 bytes
 SHA1 (patch-aa) = adc6956d4be304db61aa0323061143fffc1b9751
 SHA1 (patch-ab) = 0959e0ba7316e4fe00b656d7af2d8c2c04ed296f
-SHA1 (patch-ac) = 091b9253fd94aaf79d2287b51142a39b482f7192
-SHA1 (patch-ad) = 9d15d073dc07b1ca192a4912c7869024a6e6c7a6
-SHA1 (patch-af) = 2d2f8d6eef794e0d296a1b4fdb118323e4e89b6c
-SHA1 (patch-av) = 6cc37eb4265f31ea0fb0bcf4bf05f84f812e96c9
-SHA1 (patch-aw) = cd03eb6c81a932186370e9ed248d0c7886b7286d
+SHA1 (patch-af) = fd55cd066ac78601dc12002959d2bfafe243f65b
+SHA1 (patch-av) = 5bb6b9e90b6537d4fad71fb575986b49e56161e0
+SHA1 (patch-aw) = 8e7ad98457ab0b2b96d18cc414b6a773eb564dcc
 SHA1 (patch-ax) = 639f60616609b342a44ebd6ae6269a40c4db0767
-SHA1 (patch-ay) = 9b1dfa213491d8daf82ff8d5ee293d1279c64ce8
+SHA1 (patch-ay) = fa4a55fa0df5b92823f2390e42fe46e728aadb25
 SHA1 (patch-ba) = bd34391e522ae12ee63ec6a734f7a31116b2918d
 SHA1 (patch-bb) = 242c97ab4658838a6001d9c288e01209abfcee77
 SHA1 (patch-bc) = 31c933a03e2b05aeaff1d89d3fa542aad663e96a
diff --git a/databases/mysql4-client/patches/patch-ac b/databases/mysql4-client/patches/patch-ac
deleted file mode 100644
index 3d6fcd9062f..00000000000
--- a/databases/mysql4-client/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$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);
diff --git a/databases/mysql4-client/patches/patch-ad b/databases/mysql4-client/patches/patch-ad
deleted file mode 100644
index 4a016620ddd..00000000000
--- a/databases/mysql4-client/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$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 }'`
diff --git a/databases/mysql4-client/patches/patch-af b/databases/mysql4-client/patches/patch-af
index 7162eabe02d..64f314edc27 100644
--- a/databases/mysql4-client/patches/patch-af
+++ b/databases/mysql4-client/patches/patch-af
@@ -1,8 +1,28 @@
-$NetBSD: patch-af,v 1.7 2005/05/23 14:00:21 xtraeme Exp $
+$NetBSD: patch-af,v 1.8 2006/05/26 18:25:34 seb Exp $
 
---- configure.orig	2005-05-13 13:34:04.000000000 +0200
-+++ configure	2005-05-23 12:36:42.000000000 +0200
-@@ -37003,30 +37003,10 @@
+--- configure.orig	2006-05-23 01:12:19.000000000 +0000
++++ configure
+@@ -20463,7 +20463,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*)
+@@ -24651,6 +24651,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 }'`
+@@ -36551,30 +36555,10 @@ else
  fi;
  
  
@@ -33,7 +53,7 @@ $NetBSD: patch-af,v 1.7 2005/05/23 14:00:21 xtraeme Exp $
  
  
  
-@@ -37304,7 +37284,7 @@
+@@ -36864,7 +36848,7 @@ then
  else
    bench_dirs=""
  fi
@@ -42,7 +62,7 @@ $NetBSD: patch-af,v 1.7 2005/05/23 14:00:21 xtraeme Exp $
  
  
  # Don't build readline, i have it already
-@@ -37421,7 +37401,7 @@
+@@ -36981,7 +36965,7 @@ int
  main ()
  {
  
diff --git a/databases/mysql4-client/patches/patch-av b/databases/mysql4-client/patches/patch-av
index 6b70fedf44c..9419ccbcf79 100644
--- a/databases/mysql4-client/patches/patch-av
+++ b/databases/mysql4-client/patches/patch-av
@@ -1,18 +1,19 @@
-$NetBSD: patch-av,v 1.4 2005/07/29 21:02:35 xtraeme Exp $
+$NetBSD: patch-av,v 1.5 2006/05/26 18:25:34 seb Exp $
 
---- Makefile.in.orig	2005-07-29 22:25:15.000000000 +0200
-+++ Makefile.in	2005-07-29 22:25:55.000000000 +0200
-@@ -344,12 +344,7 @@
+--- Makefile.in.orig	2006-04-29 05:36:56.000000000 +0000
++++ Makefile.in
+@@ -352,13 +352,7 @@ AUTOMAKE_OPTIONS = foreign
+ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
+ 			README COPYING EXCEPTIONS-CLIENT
  
- # These are built from source in the Docs directory
- EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
 -			@readline_topdir@ sql-common \
 -			@thread_dirs@ pstack \
 -			@sql_union_dirs@ scripts @man_dirs@ tests \
 -			netware @libmysqld_dirs@ \
 -			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
+-
 +SUBDIRS = . include strings @sql_client_dirs@ scripts man
- 
  DIST_SUBDIRS = . include @docs_dirs@ zlib \
  			@readline_topdir@ sql-common \
+ 			@thread_dirs@ pstack \
diff --git a/databases/mysql4-client/patches/patch-aw b/databases/mysql4-client/patches/patch-aw
index 2fabaa3c178..fa0017bd0d3 100644
--- a/databases/mysql4-client/patches/patch-aw
+++ b/databases/mysql4-client/patches/patch-aw
@@ -1,16 +1,13 @@
-$NetBSD: patch-aw,v 1.2 2005/01/10 15:47:18 xtraeme Exp $
+$NetBSD: patch-aw,v 1.3 2006/05/26 18:25:34 seb Exp $
 
---- man/Makefile.in.orig	2005-01-10 13:41:15.000000000 +0100
-+++ man/Makefile.in	2005-01-10 13:41:46.000000000 +0100
-@@ -313,9 +313,8 @@
+--- man/Makefile.in.orig	2006-04-29 05:36:31.000000000 +0000
++++ man/Makefile.in
+@@ -325,7 +325,7 @@ uname_prog = @uname_prog@
  vio_dir = @vio_dir@
  vio_libs = @vio_libs@
  zlib_dir = @zlib_dir@
--man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \
--		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
--		perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1
-+man_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 \
-+	   mysqldump.1 mysqlshow.1 mysql_fix_privilege_tables.1
+-man1_MANS = @man1_files@
++man1_MANS = msql2mysql.1 mysql.1 mysql_config.1 mysql_fix_privilege_tables.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlshow.1
+ EXTRA_DIST = $(man1_MANS)
+ all: all-am
  
- EXTRA_DIST = mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \
- 		mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \
diff --git a/databases/mysql4-client/patches/patch-ay b/databases/mysql4-client/patches/patch-ay
index 6d434b619da..5b63e44efd9 100644
--- a/databases/mysql4-client/patches/patch-ay
+++ b/databases/mysql4-client/patches/patch-ay
@@ -1,28 +1,22 @@
-$NetBSD: patch-ay,v 1.2 2005/01/11 22:44:34 xtraeme Exp $
+$NetBSD: patch-ay,v 1.3 2006/05/26 18:25:34 seb Exp $
 
---- strings/Makefile.in.orig	2004-12-27 17:48:04.000000000 +0100
-+++ strings/Makefile.in	2005-01-11 23:29:03.000000000 +0100
-@@ -599,7 +599,6 @@
- 	  if test -f $$p; then \
- 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+--- strings/Makefile.in.orig	2006-04-29 05:36:54.000000000 +0000
++++ strings/Makefile.in
+@@ -583,7 +583,7 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
+ 	@list='$(pkglib_LIBRARIES)'; for p in $$list; do \
+-	  if test -f $$p; then \
++	  if false; then \
+ 	    f=$(am__strip_dir) \
  	    echo " $(pkglibLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
--	    $(pkglibLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
- 	  else :; fi; \
+ 	    $(pkglibLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
+@@ -591,7 +591,7 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR
  	done
  	@$(POST_INSTALL)
-@@ -607,7 +606,6 @@
- 	  if test -f $$p; then \
- 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
- 	    echo " $(RANLIB) '$(DESTDIR)$(pkglibdir)/$$p'"; \
--	    $(RANLIB) "$(DESTDIR)$(pkglibdir)/$$p"; \
- 	  else :; fi; \
- 	done
- 
-@@ -616,7 +614,6 @@
  	@list='$(pkglib_LIBRARIES)'; for p in $$list; do \
- 	  p="`echo $$p | sed -e 's|^.*/||'`"; \
- 	  echo " rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
--	  rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
- 	done
- 
- clean-pkglibLIBRARIES:
+-	  if test -f $$p; then \
++	  if false; then \
+ 	    p=$(am__strip_dir) \
+ 	    echo " $(RANLIB) '$(DESTDIR)$(pkglibdir)/$$p'"; \
+ 	    $(RANLIB) "$(DESTDIR)$(pkglibdir)/$$p"; \