Update mysql5-client and mysql5-server to 5.0.96, last release of

MySQL 5.0 series.


5.0.96

* yaSSL was upgraded from version 1.7.2 to 2.2.0.

5.0.95

* No change log entries.

5.0.94

* Some files in the MySQL Server sources containing legacy code still used the
  LGPL license. Such files that were no longer in use have been removed. Any
  such code that remains following this removal now appears under the GPL
  only. (Bug #11896296)

  References: See also Bug #11840513.

* Under some circumstances, the result of SUBSTRING_INDEX() incorrectly
  depended on the contents of the previous row. (Bug #42404, Bug #11751514)

5.0.93

* Security Fix: The PolyFromWKB() function could crash the server when
  improper WKB data was passed to the function. (Bug #51875, Bug #11759554,
  CVE-2010-3840)

* Security Fix: Bug #36544 was fixed.

* Security Fix: Bug #49124 and Bug #11757121 were fixed.

* Two unused test files in storage/ndb/test/sql contained incorrect versions
  of the GNU Lesser General Public License. The files and the directory
  containing them have been removed. (Bug #11810224)

  References: See also Bug #11810156.

* On FreeBSD and OpenBSD, the server incorrectly checked the range of the
  system date, causing legal values to be rejected. (Bug #55755, Bug
  #11763089)

3 files changed, 11 insertions, 11 deletions

diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common
index 1e32df0b9dd..b828c6b913f 100644
--- a/databases/mysql5-client/Makefile.common
+++ b/databases/mysql5-client/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.41 2011/02/26 02:58:55 taca Exp $
+# $NetBSD: Makefile.common,v 1.42 2012/04/14 04:04:48 taca Exp $
 #
 # used by databases/mysql5-client/Makefile
 # used by databases/mysql5-server/Makefile
 #
 
-DISTNAME=		mysql-5.0.92
+DISTNAME=		mysql-5.0.96
 CATEGORIES=		databases
 MASTER_SITES=		http://downloads.mysql.com/archives/mysql-5.0/ \
 			${MASTER_SITE_MYSQL:=MySQL-5.0/}
diff --git a/databases/mysql5-client/distinfo b/databases/mysql5-client/distinfo
index ed25da4304c..a42d02dbc9d 100644
--- a/databases/mysql5-client/distinfo
+++ b/databases/mysql5-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.30 2011/02/26 02:58:55 taca Exp $
+$NetBSD: distinfo,v 1.31 2012/04/14 04:04:48 taca Exp $
 
-SHA1 (mysql-5.0.92.tar.gz) = 10fffc7672a469af4a7fd980922b04d7ba0143ba
-RMD160 (mysql-5.0.92.tar.gz) = 24a373a1b124acf39d0c0726e5cb6f47dc1bef08
-Size (mysql-5.0.92.tar.gz) = 22440590 bytes
+SHA1 (mysql-5.0.96.tar.gz) = b28a82dccaa8a9d708f49ec5d0d0c3762d4010c8
+RMD160 (mysql-5.0.96.tar.gz) = b7c500f5aa82ab7189acc3c184db25616645e3ec
+Size (mysql-5.0.96.tar.gz) = 22686667 bytes
 SHA1 (patch-aa) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
 SHA1 (patch-ab) = ee8103143b47a428319fbc25cf2f9a69828c15f7
 SHA1 (patch-ac) = 66b6d0ffd3011df1dcf8f3be7f7300e975635d95
@@ -17,7 +17,7 @@ SHA1 (patch-al) = e028251a147246a2aa18ec6185bb2b160727a7f0
 SHA1 (patch-am) = 7fc6533477e6a0e826765106dd8d1b27cbc5695e
 SHA1 (patch-an) = 49d1c45e549c7f39a2830401621458f9a5eb46bc
 SHA1 (patch-ao) = f69d47177787bd4b69fc8f81344b6e43fcdc5d88
-SHA1 (patch-ap) = fc4246e829a3b53b27ff2c6f5572eb4b13a277e5
+SHA1 (patch-ap) = ee63b8477cbefac076d4384d671531f0795652e5
 SHA1 (patch-aq) = 18ed036f2df801124b8c717822ffc9c1224b27e3
 SHA1 (patch-ar) = b55373d58540975e24af14b13640e26c4c756923
 SHA1 (patch-as) = d301a449e67d786f9155673fdbb5e8bc2f19ee7d
diff --git a/databases/mysql5-client/patches/patch-ap b/databases/mysql5-client/patches/patch-ap
index 91de78e00ab..90bfe2a0301 100644
--- a/databases/mysql5-client/patches/patch-ap
+++ b/databases/mysql5-client/patches/patch-ap
@@ -1,14 +1,14 @@
-$NetBSD: patch-ap,v 1.2 2007/03/11 18:42:28 adam Exp $
+$NetBSD: patch-ap,v 1.3 2012/04/14 04:04:48 taca Exp $
 
---- client/mysqlbinlog.cc.orig	2007-03-05 20:21:42.000000000 +0100
+--- client/mysqlbinlog.cc.orig	2012-03-02 14:04:08.000000000 +0000
 +++ client/mysqlbinlog.cc
-@@ -36,6 +36,9 @@
+@@ -37,6 +37,9 @@
  #include "mysql_priv.h" 
  #include "log_event.h"
  #include "sql_common.h"
 +#ifdef NEEDS_BSTRING_H
 +#include <bstring.h> /* defines bzero() */
 +#endif
+ #include <welcome_copyright_notice.h> // ORACLE_WELCOME_COPYRIGHT_NOTICE
  
  #define BIN_LOG_HEADER_SIZE	4
- #define PROBE_HEADER_LEN	(EVENT_LEN_OFFSET+4)