Update mysql-* to 4.0.26:

 Functionality added or changed:

 * Added the mysql_get_client_version C API function to the embedded
   server library. (It was present in the regular client library but
   inadvertently omitted from the embedded library.)

Please see http://dev.mysql.com/doc/mysql/en/news-4-0-26.html
for more information.

7 files changed, 27 insertions, 54 deletions

diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common
index 2981d2ef318..4ea227a65b1 100644
--- a/databases/mysql-client/Makefile.common
+++ b/databases/mysql-client/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.47 2005/08/12 13:03:05 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.48 2005/09/27 00:13:29 xtraeme Exp $
 
-DISTNAME=		mysql-4.0.25
+DISTNAME=		mysql-4.0.26
 CATEGORIES=		databases
 MASTER_SITES=		http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.0/ \
 			ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \
diff --git a/databases/mysql-client/PLIST b/databases/mysql-client/PLIST
index 0003ab2217d..7e09b1282c5 100644
--- a/databases/mysql-client/PLIST
+++ b/databases/mysql-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2005/01/20 14:17:15 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.16 2005/09/27 00:13:29 xtraeme Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_config
@@ -60,9 +60,6 @@ share/examples/mysql/my-innodb-heavy-4G.cnf
 share/examples/mysql/my-large.cnf
 share/examples/mysql/my-medium.cnf
 share/examples/mysql/my-small.cnf
-share/mysql/make_binary_distribution
-share/mysql/make_sharedlib_distribution
-@dirrm share/mysql
 @dirrm share/examples/mysql
 @dirrm lib/mysql
 @dirrm include/mysql
diff --git a/databases/mysql-client/distinfo b/databases/mysql-client/distinfo
index c837d8fb07c..20c8141864c 100644
--- a/databases/mysql-client/distinfo
+++ b/databases/mysql-client/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2005/08/12 13:03:05 xtraeme Exp $
+$NetBSD: distinfo,v 1.20 2005/09/27 00:13:29 xtraeme Exp $
 
-SHA1 (mysql-4.0.25.tar.gz) = 65315c7659c75fcc9f3d9f749dbed26581f6da9c
-RMD160 (mysql-4.0.25.tar.gz) = 9c32ff5b7332712929eb2eb8eb58ae1f4be7ad46
-Size (mysql-4.0.25.tar.gz) = 11159288 bytes
+SHA1 (mysql-4.0.26.tar.gz) = e644df3568a3aa07ede2282bf5d2d9fd9adb865f
+RMD160 (mysql-4.0.26.tar.gz) = 274777aa46091618c8957aa42397d3e42d5318b4
+Size (mysql-4.0.26.tar.gz) = 11144366 bytes
 SHA1 (patch-af) = 2f3bab4108c002420e243a4ca6c9c0c3d4bdd21b
 SHA1 (patch-av) = 684c1e2ff1f96652225045653c25707850fe0ff2
 SHA1 (patch-aw) = 23d54ceddd0631aa93b32666853965a5fc7bdfab
-SHA1 (patch-ax) = 0ee6c30cc814d9404625191ac3b248ba9d9e094a
+SHA1 (patch-ax) = 49c803e55f483827507b596d695327c2deec81fb
diff --git a/databases/mysql-client/patches/patch-ax b/databases/mysql-client/patches/patch-ax
index 08c9637232c..be2bb74607f 100644
--- a/databases/mysql-client/patches/patch-ax
+++ b/databases/mysql-client/patches/patch-ax
@@ -1,8 +1,8 @@
-$NetBSD: patch-ax,v 1.2 2005/01/20 14:17:15 xtraeme Exp $
+$NetBSD: patch-ax,v 1.3 2005/09/27 00:13:29 xtraeme Exp $
 
---- scripts/Makefile.in.orig	2005-01-20 14:48:37.000000000 +0100
-+++ scripts/Makefile.in	2005-01-20 14:49:13.000000000 +0100
-@@ -292,25 +292,10 @@
+--- scripts/Makefile.in.orig	2005-09-27 01:53:28.000000000 +0200
++++ scripts/Makefile.in	2005-09-27 01:53:56.000000000 +0200
+@@ -289,23 +289,10 @@
  uname_prog = @uname_prog@
  vio_dir = @vio_dir@
  vio_libs = @vio_libs@
@@ -22,13 +22,11 @@ $NetBSD: patch-ax,v 1.2 2005/01/20 14:17:15 xtraeme Exp $
 -			mysqldumpslow \
 -			mysql_explain_log \
 -			mysql_tableinfo \
--			mysqld_multi \
--			make_win_src_distribution \
--			make_win_binary_distribution
+-			mysqld_multi
 +bin_SCRIPTS = msql2mysql mysql_config mysql_fix_privilege_tables \
 +		mysql_setpermission mysql_zap mysqlaccess mysqlbug \
 +		mysql_convert_table_format mysql_find_rows mysqlhotcopy \
 +		mysqldumpslow mysql_explain_log mysql_tableinfo
  
- EXTRA_SCRIPTS = make_binary_distribution.sh \
- 			make_sharedlib_distribution.sh \
+ noinst_SCRIPTS = make_binary_distribution \
+ 			make_sharedlib_distribution \
diff --git a/databases/mysql-server/distinfo b/databases/mysql-server/distinfo
index 093f81c310f..884c8aafda7 100644
--- a/databases/mysql-server/distinfo
+++ b/databases/mysql-server/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.31 2005/08/12 13:03:05 xtraeme Exp $
+$NetBSD: distinfo,v 1.32 2005/09/27 00:13:29 xtraeme Exp $
 
-SHA1 (mysql-4.0.25.tar.gz) = 65315c7659c75fcc9f3d9f749dbed26581f6da9c
-RMD160 (mysql-4.0.25.tar.gz) = 9c32ff5b7332712929eb2eb8eb58ae1f4be7ad46
-Size (mysql-4.0.25.tar.gz) = 11159288 bytes
+SHA1 (mysql-4.0.26.tar.gz) = e644df3568a3aa07ede2282bf5d2d9fd9adb865f
+RMD160 (mysql-4.0.26.tar.gz) = 274777aa46091618c8957aa42397d3e42d5318b4
+Size (mysql-4.0.26.tar.gz) = 11144366 bytes
 SHA1 (patch-aa) = d753d777adfa3d1357a285c0c18dfd0f6fc988b6
 SHA1 (patch-af) = 038b5d570265e1f821de6502d05f94225eba5672
 SHA1 (patch-al) = 725a3a6e06d39b26efb706bebbe3ff95da82be96
 SHA1 (patch-am) = 9b65fe456c25a45270cf73ab712191b1f7924ce7
 SHA1 (patch-aq) = 899f90143ed9f36b769e099cadd01b867423d3d7
 SHA1 (patch-ar) = d7c44e5bbed3c58e7516de5e155a82417818a39a
-SHA1 (patch-as) = d5ee30fad87682d3ed4315e41788c5ae6f68ba6e
-SHA1 (patch-at) = 62d5ccb0fdb5488b98979f2bb53d6029d0bd3d27
+SHA1 (patch-as) = 54ba4f676dff7ffa4cd7ab7ed7960316ec9ae41d
 SHA1 (patch-aw) = c82aa82430b42eaed2b6f4d588306e663e386ce1
 SHA1 (patch-ax) = 29b3087d240dbbb8a780816a115759994c6f4639
diff --git a/databases/mysql-server/patches/patch-as b/databases/mysql-server/patches/patch-as
index 298fadc841c..c0cc85c0a62 100644
--- a/databases/mysql-server/patches/patch-as
+++ b/databases/mysql-server/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.5 2005/01/20 14:17:15 xtraeme Exp $
+$NetBSD: patch-as,v 1.6 2005/09/27 00:13:29 xtraeme Exp $
 
---- support-files/Makefile.in.orig	2005-01-20 15:00:21.000000000 +0100
-+++ support-files/Makefile.in	2005-01-20 15:00:43.000000000 +0100
-@@ -315,16 +315,7 @@
+--- support-files/Makefile.in.orig	2005-09-27 02:01:46.000000000 +0200
++++ support-files/Makefile.in	2005-09-27 02:01:59.000000000 +0200
+@@ -315,13 +315,7 @@
  			MySQL-shared-compat.spec.sh
  
  SUBDIRS = MacOSX
@@ -12,11 +12,8 @@ $NetBSD: patch-as,v 1.5 2005/01/20 14:17:15 xtraeme Exp $
 -			my-huge.cnf \
 -      my-innodb-heavy-4G.cnf \
 -			mysql-log-rotate \
--			mysql-@VERSION@.spec \
--			binary-configure \
--			MySQL-shared-compat.spec
--
+-			binary-configure
 +pkgdata_DATA =
+ 
  pkgdata_SCRIPTS = mysql.server
- CLEANFILES = my-small.cnf \
- 			my-medium.cnf \
+ noinst_DATA = mysql-@VERSION@.spec \
diff --git a/databases/mysql-server/patches/patch-at b/databases/mysql-server/patches/patch-at
deleted file mode 100644
index 88078efd217..00000000000
--- a/databases/mysql-server/patches/patch-at
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-at,v 1.4 2005/01/20 14:17:15 xtraeme Exp $
-
---- support-files/MacOSX/Makefile.in.orig	2005-01-20 15:01:16.000000000 +0100
-+++ support-files/MacOSX/Makefile.in	2005-01-20 15:01:31.000000000 +0100
-@@ -301,12 +301,7 @@
- 		StartupItem.Info.plist \
- 		StartupItem.postinstall
- 
--pkgdata_DATA = Info.plist \
--		Description.plist \
--		StartupParameters.plist \
--		postinstall \
--		preinstall
--
-+pkgdata_DATA =
- CLEANFILES = Info.plist \
- 		Description.plist \
- 		StartupParameters.plist \