Update mysql4-{client,server} to 4.1.7 (latest production release).

MySQL version 4.1 offers dozens of important product enhancements
and new features, including support for:

    * Subqueries and derived tables -- allowing users to search
      complex data sets with greater ease and efficiency;
    * A significantly faster and more flexible client-server protocol
      with support for prepared statements, providing optimized query
      execution and improved warning information;
    * New GUI installer and configuration wizards for Linux and Windows,
      making it easier for developers to set up and optimize their
      MySQL databases;
    * Encrypted client-server communication using OpenSSL (GPL),
      greatly increasing security against malicious intrusion and
      unauthorized access.
    * A more highly-optimized MySQL server library with a smaller
      memory footprint that performs significantly faster when embedded
      in third-party software.
    * Extensive Unicode support through the utf8 and ucs2 international
      character sets for applications that require the use of local
      languages;
    * Industry-standard GIS spatial types for storing and managing
      geographic data;
    * Improved full text search and Help features.

4 files changed, 21 insertions, 15 deletions

diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index 3eb2b6ef564..eced392c2b5 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.13 2004/10/22 01:10:04 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.15 2004/10/28 01:12:44 xtraeme Exp $
 
-DISTNAME=		mysql-4.0.21
+DISTNAME=		mysql-4.1.7
 CATEGORIES=		databases
-MASTER_SITES=		http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.0/ \
-			ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \
-			ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-4.0/
+MASTER_SITES=		http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.1/ \
+			ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \
+			ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-4.1/
 
 MAINTAINER=		xtraeme@NetBSD.org
 HOMEPAGE=		http://www.mysql.com/
diff --git a/databases/mysql4-client/PLIST b/databases/mysql4-client/PLIST
index 83ed45c3b8a..233ee178928 100644
--- a/databases/mysql4-client/PLIST
+++ b/databases/mysql4-client/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.5 2004/10/22 01:10:04 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/10/28 01:12:44 xtraeme Exp $
+bin/client_test
 bin/make_win_binary_distribution
 bin/make_win_src_distribution
 bin/msql2mysql
 bin/mysql
 bin/mysql_config
 bin/mysql_convert_table_format
+bin/mysql_create_system_tables
 bin/mysql_explain_log
 bin/mysql_find_rows
 bin/mysql_fix_extensions
@@ -28,6 +30,7 @@ bin/mysqlmanagerc
 bin/mysqlshow
 bin/mysqltest
 include/mysql/errmsg.h
+include/mysql/keycache.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
 include/mysql/my_alloc.h
@@ -42,15 +45,20 @@ include/mysql/my_no_pthread.h
 include/mysql/my_pthread.h
 include/mysql/my_semaphore.h
 include/mysql/my_sys.h
+include/mysql/my_xml.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
 include/mysql/mysql_embed.h
+include/mysql/mysql_time.h
 include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
 include/mysql/raid.h
+include/mysql/sql_common.h
+include/mysql/sql_state.h
 include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-vars.h
+include/mysql/typelib.h
 lib/mysql/libmysqlclient.la
 man/man1/isamchk.1
 man/man1/isamlog.1
@@ -67,9 +75,7 @@ share/mysql/Description.plist
 share/mysql/Info.plist
 share/mysql/MySQL-shared-compat.spec
 share/mysql/StartupParameters.plist
-share/mysql/binary-configure
-share/mysql/make_binary_distribution
-share/mysql/make_sharedlib_distribution
+share/mysql/fill_help_tables.sql
 share/mysql/my-huge.cnf
 share/mysql/my-innodb-heavy-4G.cnf
 share/mysql/my-large.cnf
@@ -77,6 +83,7 @@ share/mysql/my-medium.cnf
 share/mysql/my-small.cnf
 share/mysql/mysql-${PKGVERSION}.spec
 share/mysql/mysql-log-rotate
+share/mysql/mysql_fix_privilege_tables.sql
 share/mysql/postinstall
 share/mysql/preinstall
 @dirrm share/mysql
diff --git a/databases/mysql4-client/buildlink3.mk b/databases/mysql4-client/buildlink3.mk
index 80ee258b1b9..2f3b6d04d0b 100644
--- a/databases/mysql4-client/buildlink3.mk
+++ b/databases/mysql4-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:21 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/10/28 01:12:44 xtraeme Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MYSQL_CLIENT_BUILDLINK3_MK:=	${MYSQL_CLIENT_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmysql-client}
 BUILDLINK_PACKAGES+=	mysql-client
 
 .if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mysql-client+=	mysql-client>=4.0.18nb1
-BUILDLINK_RECOMMENDED.mysql-client?=	mysql-client>=4.0.20nb1
+BUILDLINK_DEPENDS.mysql-client+=	mysql-client>=4.1.7
 BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql4-client
 BUILDLINK_LIBDIRS.mysql-client?=	lib/mysql
 .endif	# MYSQL_CLIENT_BUILDLINK3_MK
diff --git a/databases/mysql4-client/distinfo b/databases/mysql4-client/distinfo
index a29ef87556b..5fe89b9bbbb 100644
--- a/databases/mysql4-client/distinfo
+++ b/databases/mysql4-client/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2004/10/22 01:10:04 xtraeme Exp $
+$NetBSD: distinfo,v 1.6 2004/10/28 01:12:44 xtraeme Exp $
 
-SHA1 (mysql-4.0.21.tar.gz) = 1f5059c79e0c3718e005d41c428b83f2755fc7aa
-Size (mysql-4.0.21.tar.gz) = 14107388 bytes
+SHA1 (mysql-4.1.7.tar.gz) = 11c1c3a3004175d8b9ac710f9c7815cf759e6293
+Size (mysql-4.1.7.tar.gz) = 19849046 bytes
 SHA1 (patch-af) = 258c09335a9d675cf2367afc33f5ea0713a0b3fd