Update mysql5-client and mysql5-server package to version 5.0.90.

This release many bug fixes and DoS security problem (CVE-2009-4484).

Plese refer these URL in detail.

http://dev.mysql.com/doc/refman/5.0/en/news-5-0-89.html
http://dev.mysql.com/doc/refman/5.0/en/news-5-0-90.html

There some minor pkgsrc change to prevent compile time warnings.

11 files changed, 101 insertions, 63 deletions

diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common
index 69d6d744a1b..b2f0fa89a76 100644
--- a/databases/mysql5-client/Makefile.common
+++ b/databases/mysql5-client/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.37 2010/01/16 17:57:37 wiz Exp $
+# $NetBSD: Makefile.common,v 1.38 2010/02/18 15:46:10 taca Exp $
 #
 # used by databases/mysql5-client/Makefile
 # used by databases/mysql5-server/Makefile
 #
 
-DISTNAME=		mysql-5.0.88
+DISTNAME=		mysql-5.0.90
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_MYSQL:=MySQL-5.0/}
 
@@ -101,14 +101,14 @@ USE_TOOLS+=		autoconf bash autoheader gmake perl:run
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
 
 SUBST_CLASSES=		mk
-SUBST_STAGE.mk=		post-patch
+SUBST_STAGE.mk=		pre-configure
 SUBST_FILES.mk=		dbug/Makefile.in heap/Makefile.in	\
 			mysys/Makefile.in strings/Makefile.in
 SUBST_SED.mk=		-e "/^install-exec:/s/install-pkglibLIBRARIES//"
 SUBST_MESSAGE.mk=	Fixing Makefiles.
 
 SUBST_CLASSES+=		scr
-SUBST_STAGE.scr=	post-patch
+SUBST_STAGE.scr=	pre-configure
 SUBST_FILES.scr=	scripts/mysql_install_db.sh scripts/mysqld_safe.sh \
 			scripts/mysql_secure_installation.sh \
 			support-files/mysql.server.sh
@@ -119,7 +119,7 @@ SUBST_MESSAGE.scr=	Fixing scripts.
 # Fix broken shared library detection under Mac OS X
 .if ${OPSYS} == "Darwin"
 SUBST_CLASSES+=		dylib
-SUBST_STAGE.dylib=	post-patch
+SUBST_STAGE.dylib=	pre-configure
 SUBST_FILES.dylib=	configure
 SUBST_SED.dylib=	-e "s|\\\$$shrext_cmds|\\.dylib|g"
 .endif
diff --git a/databases/mysql5-client/buildlink3.mk b/databases/mysql5-client/buildlink3.mk
index f161509dacb..529056e8381 100644
--- a/databases/mysql5-client/buildlink3.mk
+++ b/databases/mysql5-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2010/01/17 12:02:09 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/02/18 15:46:10 taca Exp $
 
 BUILDLINK_TREE+=	mysql-client
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	mysql-client
 MYSQL_CLIENT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.mysql-client+=	mysql-client>=5.0.15
-BUILDLINK_ABI_DEPENDS.mysql-client+=	mysql-client>=5.0.88
+BUILDLINK_ABI_DEPENDS.mysql-client+=	mysql-client>=5.0.90
 BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql5-client
 BUILDLINK_LIBDIRS.mysql-client?=	lib/mysql
 BUILDLINK_INCDIRS.mysql-client?=	include/mysql
diff --git a/databases/mysql5-client/distinfo b/databases/mysql5-client/distinfo
index cc3ac329bcb..c0c0a339e8a 100644
--- a/databases/mysql5-client/distinfo
+++ b/databases/mysql5-client/distinfo
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.27 2009/11/26 16:33:29 tron Exp $
+$NetBSD: distinfo,v 1.28 2010/02/18 15:46:10 taca Exp $
 
-SHA1 (mysql-5.0.88.tar.gz) = 2dc7a462eaca1452eefd334888a6c40022deb352
-RMD160 (mysql-5.0.88.tar.gz) = a3ba4bd04e573b4a0bab073f36eec3ff44348ae6
-Size (mysql-5.0.88.tar.gz) = 22932765 bytes
+SHA1 (mysql-5.0.90.tar.gz) = c637d0afed52de1e3326824afa954d1ffbcc7a2f
+RMD160 (mysql-5.0.90.tar.gz) = 634655530100e5c00bfab9e2c498efa8c5208baf
+Size (mysql-5.0.90.tar.gz) = 22299626 bytes
 SHA1 (patch-aa) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
 SHA1 (patch-ab) = ee8103143b47a428319fbc25cf2f9a69828c15f7
-SHA1 (patch-ac) = 7e7034f64f8337e459fe16611db8d7854c02931e
+SHA1 (patch-ac) = 66b6d0ffd3011df1dcf8f3be7f7300e975635d95
 SHA1 (patch-ad) = 430b8ae2d13598eec90cfdc73d37d932dd97f217
-SHA1 (patch-ae) = 74c830dddf3517ebc2226dc166b61a33f83b04da
-SHA1 (patch-af) = b36307e554df858412c52ae53753c62d9761aaad
-SHA1 (patch-ag) = 076ab47225b66bc6d8472ec48f808641afdb780d
+SHA1 (patch-ae) = f19a31c810bbccdda48c647743a819fdf58b195f
+SHA1 (patch-af) = 9e3ebe7eb161c7ed27bf13f1fb4969ac923ae859
+SHA1 (patch-ag) = dea43cde5695c04b1b9a9e919828d97d3e049c08
 SHA1 (patch-ah) = 18f9bb2c6d9b88d04b9ade6177212ab2ed21b4d7
 SHA1 (patch-ai) = 317c20011478c631b7d150bf84e82c9c5fbb0a76
-SHA1 (patch-aj) = 1b831b1c7a616eba7d27f362a7c885ce6b853bbb
-SHA1 (patch-al) = b77d3ebb9602a33e11d22190f26ea93fd6fb533d
+SHA1 (patch-aj) = d3618dba74d97223e108b8b4a4ef2b5498d1c9b5
+SHA1 (patch-al) = e028251a147246a2aa18ec6185bb2b160727a7f0
 SHA1 (patch-am) = 7fc6533477e6a0e826765106dd8d1b27cbc5695e
 SHA1 (patch-an) = 49d1c45e549c7f39a2830401621458f9a5eb46bc
 SHA1 (patch-ao) = f69d47177787bd4b69fc8f81344b6e43fcdc5d88
@@ -22,4 +22,6 @@ SHA1 (patch-aq) = 18ed036f2df801124b8c717822ffc9c1224b27e3
 SHA1 (patch-ar) = b55373d58540975e24af14b13640e26c4c756923
 SHA1 (patch-as) = d301a449e67d786f9155673fdbb5e8bc2f19ee7d
 SHA1 (patch-at) = 626c0f6926893aa05e261ca1921fb6a352819156
+SHA1 (patch-au) = 70049d00e30d89201dd8d9fc0ace4e6edfcffae7
+SHA1 (patch-av) = e63b5be7cb1cb2e8ca8ee52e7e42632c05804959
 SHA1 (patch-bf) = 87be24d45f0d3f48ea2b911025eb41696d088299
diff --git a/databases/mysql5-client/patches/patch-ac b/databases/mysql5-client/patches/patch-ac
index 10be8afff82..e7eb8abc8d3 100644
--- a/databases/mysql5-client/patches/patch-ac
+++ b/databases/mysql5-client/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2008/09/18 11:50:44 taca Exp $
+$NetBSD: patch-ac,v 1.8 2010/02/18 15:46:10 taca Exp $
 
---- configure.in.orig	2008-08-04 21:19:07.000000000 +0900
+--- configure.in.orig	2010-01-15 09:47:42.000000000 +0000
 +++ configure.in
-@@ -2697,9 +2697,9 @@ linked_client_targets="linked_libmysql_s
+@@ -2768,9 +2768,9 @@ linked_client_targets="linked_libmysql_s
  
  if test "$THREAD_SAFE_CLIENT" = "no"
  then
diff --git a/databases/mysql5-client/patches/patch-ae b/databases/mysql5-client/patches/patch-ae
index 2642257d7f9..ab104e54c9c 100644
--- a/databases/mysql5-client/patches/patch-ae
+++ b/databases/mysql5-client/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.9 2007/07/15 19:22:06 tron Exp $
+$NetBSD: patch-ae,v 1.10 2010/02/18 15:46:10 taca Exp $
 
---- scripts/Makefile.in.orig	2007-07-04 14:10:00.000000000 +0100
-+++ scripts/Makefile.in	2007-07-15 17:24:02.000000000 +0100
-@@ -377,13 +377,12 @@
+--- scripts/Makefile.in.orig	2010-01-15 09:54:00.000000000 +0000
++++ scripts/Makefile.in
+@@ -377,13 +377,12 @@ zlib_dir = @zlib_dir@
  BUILT_SOURCES = mysql_fix_privilege_tables.sql \
  		mysql_fix_privilege_tables_sql.c
  
@@ -17,11 +17,13 @@ $NetBSD: patch-ae,v 1.9 2007/07/15 19:22:06 tron Exp $
  			mysql_zap \
  			mysqlaccess \
  			mysqlbug \
-@@ -394,7 +393,6 @@
+@@ -393,8 +392,7 @@ bin_SCRIPTS = @server_scripts@ \
+ 			mysqldumpslow \
  			mysql_explain_log \
  			mysql_tableinfo \
- 			mysql_upgrade_shell \
+-			mysql_upgrade_shell \
 -			mysqld_multi
++			mysql_upgrade_shell
  
  noinst_SCRIPTS = make_binary_distribution \
  			make_sharedlib_distribution \
diff --git a/databases/mysql5-client/patches/patch-af b/databases/mysql5-client/patches/patch-af
index 975fcc422a0..13efae8d5ee 100644
--- a/databases/mysql5-client/patches/patch-af
+++ b/databases/mysql5-client/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.7 2008/09/18 11:50:44 taca Exp $
+$NetBSD: patch-af,v 1.8 2010/02/18 15:46:10 taca Exp $
 
---- man/Makefile.in.orig	2008-08-04 15:22:07.000000000 +0300
-+++ man/Makefile.in	2008-09-16 12:17:49.000000000 +0300
-@@ -354,8 +354,9 @@
+--- man/Makefile.in.orig	2010-01-15 09:53:44.000000000 +0000
++++ man/Makefile.in
+@@ -349,8 +349,9 @@ yassl_h_ln_cmd = @yassl_h_ln_cmd@
  yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
diff --git a/databases/mysql5-client/patches/patch-ag b/databases/mysql5-client/patches/patch-ag
index 8b5b10db0f6..56a532c7a4c 100644
--- a/databases/mysql5-client/patches/patch-ag
+++ b/databases/mysql5-client/patches/patch-ag
@@ -1,28 +1,13 @@
-$NetBSD: patch-ag,v 1.4 2008/09/18 11:50:44 taca Exp $
+$NetBSD: patch-ag,v 1.5 2010/02/18 15:46:10 taca Exp $
 
---- strings/Makefile.in.orig	2008-08-04 15:22:30.000000000 +0300
-+++ strings/Makefile.in	2008-09-16 12:18:09.000000000 +0300
-@@ -622,7 +622,6 @@
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
- 	    echo " $(pkglibLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
--	    $(pkglibLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
- 	  else :; fi; \
- 	done
- 	@$(POST_INSTALL)
-@@ -630,7 +629,6 @@
- 	  if test -f $$p; then \
- 	    p=$(am__strip_dir) \
- 	    echo " $(RANLIB) '$(DESTDIR)$(pkglibdir)/$$p'"; \
--	    $(RANLIB) "$(DESTDIR)$(pkglibdir)/$$p"; \
- 	  else :; fi; \
- 	done
+--- strings/Makefile.in.orig	2010-01-15 09:54:02.000000000 +0000
++++ strings/Makefile.in
+@@ -889,7 +889,7 @@ install-data-am:
  
-@@ -639,7 +637,6 @@
- 	@list='$(pkglib_LIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
--	  rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
- 	done
+ install-dvi: install-dvi-am
+ 
+-install-exec-am: install-pkglibLIBRARIES
++install-exec-am:
+ 
+ install-html: install-html-am
  
- clean-pkglibLIBRARIES:
diff --git a/databases/mysql5-client/patches/patch-aj b/databases/mysql5-client/patches/patch-aj
index f0b061c53fd..7569b97a692 100644
--- a/databases/mysql5-client/patches/patch-aj
+++ b/databases/mysql5-client/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.3 2008/09/18 11:50:44 taca Exp $
+$NetBSD: patch-aj,v 1.4 2010/02/18 15:46:10 taca Exp $
 
---- client/mysqladmin.cc.orig	2008-08-04 15:19:04.000000000 +0300
-+++ client/mysqladmin.cc	2008-09-16 12:18:37.000000000 +0300
-@@ -331,8 +331,14 @@
+--- client/mysqladmin.cc.orig	2010-01-15 09:47:38.000000000 +0000
++++ client/mysqladmin.cc
+@@ -332,8 +332,14 @@ int main(int argc,char *argv[])
    if (tty_password)
      opt_password = get_tty_password(NullS);
  
diff --git a/databases/mysql5-client/patches/patch-al b/databases/mysql5-client/patches/patch-al
index 423598a4d83..70a5e3976dc 100644
--- a/databases/mysql5-client/patches/patch-al
+++ b/databases/mysql5-client/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.3 2008/09/18 11:50:44 taca Exp $
+$NetBSD: patch-al,v 1.4 2010/02/18 15:46:10 taca Exp $
 
---- include/Makefile.in.orig	2008-08-04 15:22:05.000000000 +0300
-+++ include/Makefile.in	2008-09-16 12:19:22.000000000 +0300
-@@ -366,6 +366,7 @@
+--- include/Makefile.in.orig	2010-01-15 09:53:42.000000000 +0000
++++ include/Makefile.in
+@@ -361,6 +361,7 @@ zlib_dir = @zlib_dir@
  BUILT_SOURCES = $(HEADERS_GEN) abi_check
  HEADERS_GEN = mysql_version.h my_config.h
  HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \
diff --git a/databases/mysql5-client/patches/patch-au b/databases/mysql5-client/patches/patch-au
new file mode 100644
index 00000000000..ef82b6d2f50
--- /dev/null
+++ b/databases/mysql5-client/patches/patch-au
@@ -0,0 +1,28 @@
+$NetBSD: patch-au,v 1.5 2010/02/18 15:46:10 taca Exp $
+
+Prevent redefined warning.
+
+--- include/my_no_pthread.h.orig	2010-01-15 09:47:45.000000000 +0000
++++ include/my_no_pthread.h
+@@ -41,9 +41,21 @@
+   to make thread safe code, that should also work in single thread
+   environment, easier to use.
+ */
++#ifdef pthread_mutex_init
++#undef pthread_mutex_init
++#endif
+ #define pthread_mutex_init(A,B)
++#ifdef pthread_mutex_lock
++#undef pthread_mutex_lock
++#endif
+ #define pthread_mutex_lock(A)
++#ifdef pthread_mutex_unlock
++#undef pthread_mutex_unlock
++#endif
+ #define pthread_mutex_unlock(A)
++#ifdef pthread_mutex_destroy
++#undef pthread_mutex_destroy
++#endif
+ #define pthread_mutex_destroy(A)
+ #define my_rwlock_init(A,B)
+ #define rw_rdlock(A)
diff --git a/databases/mysql5-client/patches/patch-av b/databases/mysql5-client/patches/patch-av
new file mode 100644
index 00000000000..f91cdef6d00
--- /dev/null
+++ b/databases/mysql5-client/patches/patch-av
@@ -0,0 +1,21 @@
+$NetBSD: patch-av,v 1.1 2010/02/18 15:46:10 taca Exp $
+
+Prevent redefined warning.
+
+--- sql/sql_profile.h.orig	2010-01-15 09:49:22.000000000 +0000
++++ sql/sql_profile.h
+@@ -17,12 +17,14 @@
+ #define _SQL_PROFILE_H
+ 
+ #if __STDC_VERSION__ < 199901L
++# ifndef __func__
+ #  if __GNUC__ >= 2
+ #    define __func__ __FUNCTION__
+ #  else
+ #    define __func__ _unknown_func_
+ extern const char * const _unknown_func_;
+ #  endif
++# endif
+ #elif defined(_MSC_VER)
+ #  if _MSC_VER < 1300
+ #     define __func__ _unknown_func_