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.

8 files changed, 82 insertions, 46 deletions

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_