Update mysql5-* to 5.0.20.

To see new changes and bugs fixed, see:
http://dev.mysql.com/doc/refman/5.0/en/news-5-0-x.html.

5 files changed, 31 insertions, 33 deletions

diff --git a/databases/mysql5-client/Makefile b/databases/mysql5-client/Makefile
index c381f533a41..4a78145c3db 100644
--- a/databases/mysql5-client/Makefile
+++ b/databases/mysql5-client/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2006/04/12 11:00:24 tron Exp $
+# $NetBSD: Makefile,v 1.7 2006/04/13 11:19:25 xtraeme Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
-PKGREVISION=		1
+#PKGREVISION=		1
 SVR4_PKGNAME=		mysqc
 COMMENT=		MySQL 5, a free SQL database (client)
 
diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common
index 71a99e38b83..8b6c42a355a 100644
--- a/databases/mysql5-client/Makefile.common
+++ b/databases/mysql5-client/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.9 2006/04/12 13:26:11 tron Exp $
+# $NetBSD: Makefile.common,v 1.10 2006/04/13 11:19:25 xtraeme Exp $
 
-DISTNAME=		mysql-5.0.18
+DISTNAME=		mysql-5.0.20
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_MYSQL:=MySQL-5.0/}
 
diff --git a/databases/mysql5-client/PLIST b/databases/mysql5-client/PLIST
index 9988f631b39..2b3e0506df7 100644
--- a/databases/mysql5-client/PLIST
+++ b/databases/mysql5-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/03/30 03:44:42 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/04/13 11:19:25 xtraeme Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_config
@@ -6,9 +6,11 @@ bin/mysql_convert_table_format
 bin/mysql_create_system_tables
 bin/mysql_explain_log
 bin/mysql_find_rows
+bin/mysql_fix_extensions
 bin/mysql_fix_privilege_tables
 bin/mysql_setpermission
 bin/mysql_tableinfo
+bin/mysql_upgrade
 bin/mysql_zap
 bin/mysqlaccess
 bin/mysqladmin
@@ -54,7 +56,6 @@ include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-vars.h
 include/mysql/typelib.h
-info/mysql.info
 lib/mysql/libmysqlclient.la
 lib/mysql/libmysqlclient_r.la
 man/man1/mysql.1
diff --git a/databases/mysql5-client/distinfo b/databases/mysql5-client/distinfo
index 62927961edf..6d3e550c75d 100644
--- a/databases/mysql5-client/distinfo
+++ b/databases/mysql5-client/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.4 2006/01/09 16:25:01 xtraeme Exp $
+$NetBSD: distinfo,v 1.5 2006/04/13 11:19:25 xtraeme Exp $
 
-SHA1 (mysql-5.0.18.tar.gz) = e102a5086455c0f80a830e5dfc65acccc5e19a60
-RMD160 (mysql-5.0.18.tar.gz) = 1987df6d9446637c8e353f61e269e9a57d995803
-Size (mysql-5.0.18.tar.gz) = 19169082 bytes
+SHA1 (mysql-5.0.20.tar.gz) = b66fd7821d6cb5f3150f703e90d64697a770a165
+RMD160 (mysql-5.0.20.tar.gz) = f7daabd98124b88c021b314ac23c25d09597e573
+Size (mysql-5.0.20.tar.gz) = 19445124 bytes
 SHA1 (patch-aa) = adc6956d4be304db61aa0323061143fffc1b9751
 SHA1 (patch-ab) = 0959e0ba7316e4fe00b656d7af2d8c2c04ed296f
 SHA1 (patch-ac) = c97ef88d13cba67b79cdb40fc23facf29edbe0b8
 SHA1 (patch-ad) = 81c48274e3a43e46cf9d53f9ed4620c02761902a
-SHA1 (patch-ae) = fa70584c1846c81fe72a7796b1f7f237b398bc30
+SHA1 (patch-ae) = 3fe37b158abdd892f077c805ce3eb4ba19dc4594
 SHA1 (patch-af) = 61f9cfd169e630708809142694d2bbea0055d20d
 SHA1 (patch-ag) = 9b1dfa213491d8daf82ff8d5ee293d1279c64ce8
 SHA1 (patch-ah) = bd34391e522ae12ee63ec6a734f7a31116b2918d
diff --git a/databases/mysql5-client/patches/patch-ae b/databases/mysql5-client/patches/patch-ae
index b97f05128fb..a2db3ab9db0 100644
--- a/databases/mysql5-client/patches/patch-ae
+++ b/databases/mysql5-client/patches/patch-ae
@@ -1,32 +1,29 @@
-$NetBSD: patch-ae,v 1.3 2006/01/09 16:25:01 xtraeme Exp $
+$NetBSD: patch-ae,v 1.4 2006/04/13 11:19:25 xtraeme Exp $
 
---- scripts/Makefile.in.orig	2006-01-09 15:54:43.000000000 +0100
-+++ scripts/Makefile.in	2006-01-09 15:55:14.000000000 +0100
-@@ -341,23 +341,10 @@
+Don't install scripts handled by mysql-server.
+
+--- scripts/Makefile.in.orig	2006-04-13 11:58:39.000000000 +0200
++++ scripts/Makefile.in	2006-04-13 12:00:06.000000000 +0200
+@@ -344,13 +344,12 @@
  yassl_libs_with_path = @yassl_libs_with_path@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
 -bin_SCRIPTS = @server_scripts@ \
--			msql2mysql \
--			mysql_config \
--			mysql_fix_privilege_tables \
--			mysql_fix_extensions \
--			mysql_setpermission \
++bin_SCRIPTS = \
+ 			msql2mysql \
+ 			mysql_config \
+ 			mysql_fix_privilege_tables \
+ 			mysql_fix_extensions \
+ 			mysql_setpermission \
 -			mysql_secure_installation \
--			mysql_zap \
--			mysqlaccess \
--			mysqlbug \
--			mysql_convert_table_format \
--			mysql_find_rows \
--			mysqlhotcopy \
--			mysqldumpslow \
--			mysql_explain_log \
--			mysql_tableinfo \
+ 			mysql_zap \
+ 			mysqlaccess \
+ 			mysqlbug \
+@@ -361,7 +360,6 @@
+ 			mysql_explain_log \
+ 			mysql_tableinfo \
+ 			mysql_upgrade \
 -			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 \
  			mysql_create_system_tables
  
  noinst_SCRIPTS = make_binary_distribution \