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.

15 files changed, 117 insertions, 61 deletions

diff --git a/databases/mysql5-server/Makefile b/databases/mysql5-server/Makefile
index 1fd57589975..eea1ed8cf0c 100644
--- a/databases/mysql5-server/Makefile
+++ b/databases/mysql5-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2010/01/17 12:02:09 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2010/02/18 15:46:10 taca Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
-PKGREVISION=		1
 SVR4_PKGNAME=		mysqs
 COMMENT=		MySQL 5, a free SQL database (server)
 
diff --git a/databases/mysql5-server/PLIST b/databases/mysql5-server/PLIST
index 862e773617f..4c4dee9c6c1 100644
--- a/databases/mysql5-server/PLIST
+++ b/databases/mysql5-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2009/11/26 16:33:29 tron Exp $
+@comment $NetBSD: PLIST,v 1.16 2010/02/18 15:46:10 taca Exp $
 bin/comp_err
 bin/innochecksum
 bin/my_print_defaults
@@ -190,6 +190,7 @@ share/mysql-test/r/big_test.require
 share/mysql-test/r/bigint.result
 share/mysql-test/r/binary.result
 share/mysql-test/r/binlog.result
+share/mysql-test/r/binlog_delete_and_flush_index.result
 share/mysql-test/r/binlog_index.result
 share/mysql-test/r/binlog_innodb.result
 share/mysql-test/r/binlog_killed.result
@@ -406,6 +407,8 @@ share/mysql-test/r/innodb.result
 share/mysql-test/r/innodb_bug35220.result
 share/mysql-test/r/innodb_bug40565.result
 share/mysql-test/r/innodb_bug42419.result
+share/mysql-test/r/innodb_bug46000.result
+share/mysql-test/r/innodb_bug47777.result
 share/mysql-test/r/innodb_cache.result
 share/mysql-test/r/innodb_gis.result
 share/mysql-test/r/innodb_handler.result
@@ -1450,6 +1453,7 @@ share/mysql-test/t/bigint.test
 share/mysql-test/t/binary.test
 share/mysql-test/t/binlog-master.opt
 share/mysql-test/t/binlog.test
+share/mysql-test/t/binlog_delete_and_flush_index.test
 share/mysql-test/t/binlog_index.test
 share/mysql-test/t/binlog_innodb.test
 share/mysql-test/t/binlog_killed.test
@@ -1647,6 +1651,8 @@ share/mysql-test/t/innodb.test
 share/mysql-test/t/innodb_bug35220.test
 share/mysql-test/t/innodb_bug40565.test
 share/mysql-test/t/innodb_bug42419.test
+share/mysql-test/t/innodb_bug46000.test
+share/mysql-test/t/innodb_bug47777.test
 share/mysql-test/t/innodb_cache-master.opt
 share/mysql-test/t/innodb_cache.test
 share/mysql-test/t/innodb_gis.test
diff --git a/databases/mysql5-server/distinfo b/databases/mysql5-server/distinfo
index f4d7b9b40e7..94c206d6ef4 100644
--- a/databases/mysql5-server/distinfo
+++ b/databases/mysql5-server/distinfo
@@ -1,21 +1,23 @@
-$NetBSD: distinfo,v 1.23 2009/11/26 16:33:29 tron Exp $
+$NetBSD: distinfo,v 1.24 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 (patch-aa) = 913ffbbd5ce8496f412d30515fb5ecef23854023
+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) = f52745512abfb2c2d43715975f76c2f454ed93e5
 SHA1 (patch-ab) = 7c51a0214c3e6205605047c72b07eac6792600db
 SHA1 (patch-ae) = dc67ad03f9ea370b17a45f73e974013e0ac48d71
 SHA1 (patch-af) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
-SHA1 (patch-ag) = 6412da46f0d891b64d90c2e3f9b79a1ec442d617
-SHA1 (patch-ah) = 7f0a59e03ced1f0c5947a807d99cb6fad64be597
+SHA1 (patch-ag) = abc6b85dd7d72b980f0768166eb77618d50e5102
+SHA1 (patch-ah) = 822f1f0eace49ff44f03e708056b88e480443c15
 SHA1 (patch-ai) = 56d3f66a903224b8d27213480e7ea3e485e52f1d
-SHA1 (patch-aj) = c3a0d3df30775e19017ca0835fbc15ea879b0c55
+SHA1 (patch-aj) = b8516c18b1c2be5b3492ece583e9b8a85b89331a
 SHA1 (patch-ak) = 27698a132b42519e267dda0584a75eae1b74edea
 SHA1 (patch-al) = a8232565e70d199b77e044152dee3df52564724b
-SHA1 (patch-am) = 3820fde3c4124822cba9a2e6265f21b08d8276d5
-SHA1 (patch-an) = c4f856a64ac7e2cadecf594744176d09736468d5
-SHA1 (patch-bf) = 87be24d45f0d3f48ea2b911025eb41696d088299
-SHA1 (patch-ca) = 97fe10dc40c5995b174f8e07dc5e22a72b9913f4
-SHA1 (patch-cb) = f7dbc53f2405bf8a38c3d307dc68560a1b79ed01
-SHA1 (patch-cc) = 0f4bc2bc83291c42381e39339e9b6507b7fd151a
+SHA1 (patch-am) = cc551d150c5b0adee8906d428b87bdc88ea47a05
+SHA1 (patch-an) = 1f7ede981f2e7a846f49a5cfd443051acf9f3a02
+SHA1 (patch-ap) = 70049d00e30d89201dd8d9fc0ace4e6edfcffae7
+SHA1 (patch-aq) = e63b5be7cb1cb2e8ca8ee52e7e42632c05804959
+SHA1 (patch-bf) = 180aefb012a0d17269654ba0aeb71ec74ea98e6c
+SHA1 (patch-ca) = 8d3f658a44a8d225a362b7f6135c772ee53ba5e3
+SHA1 (patch-cb) = b3a6bcc6f201b3ba1068ebe2d0cef3fbb22ab621
+SHA1 (patch-cc) = 2d1347ba57e35da484edd4fa3c764441ec6a80ed
diff --git a/databases/mysql5-server/patches/patch-aa b/databases/mysql5-server/patches/patch-aa
index 211e3eb9d95..58e00239cfa 100644
--- a/databases/mysql5-server/patches/patch-aa
+++ b/databases/mysql5-server/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2007/07/15 19:22:07 tron Exp $
+$NetBSD: patch-aa,v 1.6 2010/02/18 15:46:10 taca Exp $
 
---- Makefile.in.orig	2007-07-04 14:10:07.000000000 +0100
-+++ Makefile.in	2007-07-15 18:10:44.000000000 +0100
-@@ -374,12 +374,8 @@
+--- Makefile.in.orig	2010-01-15 09:54:05.000000000 +0000
++++ Makefile.in
+@@ -375,12 +375,8 @@ AUTOMAKE_OPTIONS = foreign
  EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
  			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
  
diff --git a/databases/mysql5-server/patches/patch-ag b/databases/mysql5-server/patches/patch-ag
index af5fe67e266..71495e50a9a 100644
--- a/databases/mysql5-server/patches/patch-ag
+++ b/databases/mysql5-server/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.7 2008/09/18 11:51:37 taca Exp $
+$NetBSD: patch-ag,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 13:48:02.000000000 +0300
-@@ -354,7 +354,7 @@
+--- man/Makefile.in.orig	2010-01-15 09:53:44.000000000 +0000
++++ man/Makefile.in
+@@ -349,7 +349,7 @@ 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-server/patches/patch-ah b/databases/mysql5-server/patches/patch-ah
index 80192091ae4..0b48b874770 100644
--- a/databases/mysql5-server/patches/patch-ah
+++ b/databases/mysql5-server/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.6 2007/07/15 19:22:07 tron Exp $
+$NetBSD: patch-ah,v 1.7 2010/02/18 15:46:10 taca Exp $
 
---- include/Makefile.in.orig	2007-07-04 14:09:35.000000000 +0100
-+++ include/Makefile.in	2007-07-15 18:12:08.000000000 +0100
-@@ -364,13 +364,7 @@
+--- include/Makefile.in.orig	2010-01-15 09:53:42.000000000 +0000
++++ include/Makefile.in
+@@ -363,13 +363,7 @@ HEADERS_GEN = mysql_version.h my_config.
  HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \
  			my_list.h my_alloc.h typelib.h
  
diff --git a/databases/mysql5-server/patches/patch-aj b/databases/mysql5-server/patches/patch-aj
index 37613199cef..c078fdcbb28 100644
--- a/databases/mysql5-server/patches/patch-aj
+++ b/databases/mysql5-server/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.3 2007/03/11 18:42:50 adam Exp $
+$NetBSD: patch-aj,v 1.4 2010/02/18 15:46:10 taca Exp $
 
---- scripts/mysqld_safe.sh.orig	2007-03-05 20:21:13.000000000 +0100
+--- scripts/mysqld_safe.sh.orig	2010-01-15 09:49:15.000000000 +0000
 +++ scripts/mysqld_safe.sh
-@@ -331,6 +331,14 @@ then
+@@ -345,6 +345,14 @@ then
    ulimit -c $core_file_size
  fi
  
@@ -17,7 +17,7 @@ $NetBSD: patch-aj,v 1.3 2007/03/11 18:42:50 adam Exp $
  #
  # If there exists an old pid file, check if the daemon is already running
  # Note: The switches to 'ps' may depend on your operating system
-@@ -341,18 +349,16 @@ then
+@@ -355,18 +363,16 @@ then
    then
      if @FIND_PROC@
      then    # The pid contains a mysqld process
@@ -40,7 +40,7 @@ $NetBSD: patch-aj,v 1.3 2007/03/11 18:42:50 adam Exp $
      exit 1
    fi
  fi
-@@ -365,11 +371,11 @@ fi
+@@ -379,11 +385,11 @@ fi
  # Alternatively, you can start mysqld with the "myisam-recover" option. See
  # the manual for details.
  #
@@ -54,7 +54,7 @@ $NetBSD: patch-aj,v 1.3 2007/03/11 18:42:50 adam Exp $
  
  # Does this work on all systems?
  #if type ulimit | grep "shell builtin" > /dev/null
-@@ -377,7 +383,7 @@ echo "Starting $MYSQLD daemon with datab
+@@ -391,7 +397,7 @@ echo "Starting $MYSQLD daemon with datab
  #  ulimit -n 256 > /dev/null 2>&1		# Fix for BSD and FreeBSD systems
  #fi
  
@@ -63,7 +63,7 @@ $NetBSD: patch-aj,v 1.3 2007/03/11 18:42:50 adam Exp $
  while true
  do
    rm -f $safe_mysql_unix_port $pid_file	# Some extra safety
-@@ -389,7 +395,7 @@ do
+@@ -403,7 +409,7 @@ do
    fi
    if test ! -f $pid_file		# This is removed if normal shutdown
    then
@@ -72,7 +72,7 @@ $NetBSD: patch-aj,v 1.3 2007/03/11 18:42:50 adam Exp $
      break
    fi
  
-@@ -402,7 +408,7 @@ do
+@@ -416,7 +422,7 @@ do
      # kill -9 is used or the process won't react on the kill.
      numofproces=`ps xaww | grep -v "grep" | grep "$ledir/$MYSQLD\>" | grep -c "pid-file=$pid_file"`
  
@@ -81,7 +81,7 @@ $NetBSD: patch-aj,v 1.3 2007/03/11 18:42:50 adam Exp $
      I=1
      while test "$I" -le "$numofproces"
      do 
-@@ -415,16 +421,14 @@ do
+@@ -429,16 +435,14 @@ do
        #    echo "TEST $I - $T **"
        if kill -9 $T
        then
diff --git a/databases/mysql5-server/patches/patch-am b/databases/mysql5-server/patches/patch-am
index 2c86e98bf1a..93eb5125970 100644
--- a/databases/mysql5-server/patches/patch-am
+++ b/databases/mysql5-server/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.3 2007/05/21 04:40:01 xtraeme Exp $
+$NetBSD: patch-am,v 1.4 2010/02/18 15:46:10 taca Exp $
 
---- extra/Makefile.in.orig	2007-05-21 06:05:42.000000000 +0200
-+++ extra/Makefile.in	2007-05-21 06:05:59.000000000 +0200
-@@ -437,10 +437,7 @@
+--- extra/Makefile.in.orig	2010-01-15 09:53:39.000000000 +0000
++++ extra/Makefile.in
+@@ -445,10 +445,7 @@ LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/
  			../dbug/libdbug.a ../strings/libmystrings.a \
  			$(ZLIB_LIBS)
  
diff --git a/databases/mysql5-server/patches/patch-an b/databases/mysql5-server/patches/patch-an
index 057b01998b5..c59805d167a 100644
--- a/databases/mysql5-server/patches/patch-an
+++ b/databases/mysql5-server/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.6 2009/11/26 16:33:29 tron Exp $
+$NetBSD: patch-an,v 1.7 2010/02/18 15:46:10 taca Exp $
 
---- mysql-test/Makefile.in.orig	2009-11-09 18:37:53.000000000 +0000
-+++ mysql-test/Makefile.in	2009-11-26 15:16:50.000000000 +0000
-@@ -368,7 +368,7 @@
+--- mysql-test/Makefile.in.orig	2010-01-15 09:53:45.000000000 +0000
++++ mysql-test/Makefile.in
+@@ -369,7 +369,7 @@ zlib_dir = @zlib_dir@
  @HAVE_NDBCLUSTER_DB_FALSE@USE_NDBCLUSTER = \"\"
  @HAVE_NDBCLUSTER_DB_TRUE@USE_NDBCLUSTER = \"--ndbcluster\"
  benchdir_root = $(prefix)
diff --git a/databases/mysql5-server/patches/patch-ap b/databases/mysql5-server/patches/patch-ap
new file mode 100644
index 00000000000..055ddcab2b1
--- /dev/null
+++ b/databases/mysql5-server/patches/patch-ap
@@ -0,0 +1,28 @@
+$NetBSD: patch-ap,v 1.1 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-server/patches/patch-aq b/databases/mysql5-server/patches/patch-aq
new file mode 100644
index 00000000000..a8f40613f4a
--- /dev/null
+++ b/databases/mysql5-server/patches/patch-aq
@@ -0,0 +1,21 @@
+$NetBSD: patch-aq,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_
diff --git a/databases/mysql5-server/patches/patch-bf b/databases/mysql5-server/patches/patch-bf
index 213259fc610..13a445cce84 100644
--- a/databases/mysql5-server/patches/patch-bf
+++ b/databases/mysql5-server/patches/patch-bf
@@ -1,8 +1,8 @@
-$NetBSD: patch-bf,v 1.2 2007/03/11 18:42:50 adam Exp $
+$NetBSD: patch-bf,v 1.3 2010/02/18 15:46:10 taca Exp $
 
---- bdb/dist/configure.orig	2007-03-05 20:23:33.000000000 +0100
+--- bdb/dist/configure.orig	2010-01-15 09:54:18.000000000 +0000
 +++ bdb/dist/configure
-@@ -5039,7 +5039,7 @@ fi
+@@ -5939,7 +5939,7 @@ fi
  # we're using.
  case "$host_os" in
  sysv5UnixWare*|sysv5OpenUNIX8*)
diff --git a/databases/mysql5-server/patches/patch-ca b/databases/mysql5-server/patches/patch-ca
index 4c9c8643b6e..216aa52f8c7 100644
--- a/databases/mysql5-server/patches/patch-ca
+++ b/databases/mysql5-server/patches/patch-ca
@@ -1,12 +1,12 @@
-$NetBSD: patch-ca,v 1.2 2008/09/18 11:51:37 taca Exp $
+$NetBSD: patch-ca,v 1.3 2010/02/18 15:46:10 taca Exp $
 
 Before calling sigsend(), make sure the function actuall exists. Fixes
 the build on NetBSD >= 4.99.49, in which the macro P_MYID is defined
 somewhere unrelated to signals.
 
---- configure.in.orig	2008-08-04 15:19:07.000000000 +0300
-+++ configure.in	2008-09-16 13:52:59.000000000 +0300
-@@ -2001,7 +2001,7 @@
+--- configure.in.orig	2010-01-15 09:47:42.000000000 +0000
++++ configure.in
+@@ -2051,7 +2051,7 @@ AC_CHECK_HEADERS(varargs.h stdarg.h dire
  paths.h semaphore.h)
  
  # Already-done: strcasecmp
diff --git a/databases/mysql5-server/patches/patch-cb b/databases/mysql5-server/patches/patch-cb
index 20dafe5a192..79115e78781 100644
--- a/databases/mysql5-server/patches/patch-cb
+++ b/databases/mysql5-server/patches/patch-cb
@@ -1,10 +1,10 @@
-$NetBSD: patch-cb,v 1.2 2008/09/18 11:51:37 taca Exp $
+$NetBSD: patch-cb,v 1.3 2010/02/18 15:46:10 taca Exp $
 
 See patch-ca.
 
---- libmysqld/stacktrace.c.orig	2008-08-04 15:20:12.000000000 +0300
-+++ libmysqld/stacktrace.c	2008-09-16 13:53:23.000000000 +0300
-@@ -252,7 +252,7 @@
+--- libmysqld/stacktrace.c.orig	2010-01-15 09:49:23.000000000 +0000
++++ libmysqld/stacktrace.c
+@@ -271,7 +271,7 @@ void write_core(int sig)
    __gcov_flush();
  #endif
    pthread_kill(pthread_self(), sig);
diff --git a/databases/mysql5-server/patches/patch-cc b/databases/mysql5-server/patches/patch-cc
index eaf5f2a633c..12013d328d8 100644
--- a/databases/mysql5-server/patches/patch-cc
+++ b/databases/mysql5-server/patches/patch-cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-cc,v 1.2 2008/09/18 11:51:37 taca Exp $
+$NetBSD: patch-cc,v 1.3 2010/02/18 15:46:10 taca Exp $
 
 See patch-ca.
 
---- sql/stacktrace.c.orig	2008-08-04 15:20:12.000000000 +0300
-+++ sql/stacktrace.c	2008-09-16 13:53:45.000000000 +0300
-@@ -252,7 +252,7 @@
+--- sql/stacktrace.c.orig	2010-01-15 09:49:23.000000000 +0000
++++ sql/stacktrace.c
+@@ -271,7 +271,7 @@ void write_core(int sig)
    __gcov_flush();
  #endif
    pthread_kill(pthread_self(), sig);