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)

14 files changed, 25 insertions, 209 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)
diff --git a/databases/mysql5-server/Makefile b/databases/mysql5-server/Makefile
index ab2395ee5c2..6223e3267f7 100644
--- a/databases/mysql5-server/Makefile
+++ b/databases/mysql5-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2011/08/02 16:15:08 taca Exp $
+# $NetBSD: Makefile,v 1.33 2012/04/14 04:04:48 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 9b146ba127f..ad84e0bc7d2 100644
--- a/databases/mysql5-server/PLIST
+++ b/databases/mysql5-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2011/02/26 02:58:55 taca Exp $
+@comment $NetBSD: PLIST,v 1.18 2012/04/14 04:04:48 taca Exp $
 bin/comp_err
 bin/innochecksum
 bin/my_print_defaults
@@ -611,6 +611,7 @@ share/mysql-test/r/rpl_change_master.result
 share/mysql-test/r/rpl_charset.result
 share/mysql-test/r/rpl_charset_sjis.result
 share/mysql-test/r/rpl_commit_after_flush.result
+share/mysql-test/r/rpl_conditional_comments.result
 share/mysql-test/r/rpl_create_database.result
 share/mysql-test/r/rpl_critical_errors.result
 share/mysql-test/r/rpl_ddl.result
@@ -702,6 +703,7 @@ share/mysql-test/r/rpl_user_variables.result
 share/mysql-test/r/rpl_variables.result
 share/mysql-test/r/rpl_view.result
 share/mysql-test/r/schema.result
+share/mysql-test/r/secure_file_priv_win.result
 share/mysql-test/r/select.result
 share/mysql-test/r/select_found.result
 share/mysql-test/r/select_safe.result
@@ -1894,6 +1896,7 @@ share/mysql-test/t/rpl_change_master.test
 share/mysql-test/t/rpl_charset.test
 share/mysql-test/t/rpl_charset_sjis.test
 share/mysql-test/t/rpl_commit_after_flush.test
+share/mysql-test/t/rpl_conditional_comments.test
 share/mysql-test/t/rpl_create_database-master.opt
 share/mysql-test/t/rpl_create_database-slave.opt
 share/mysql-test/t/rpl_create_database.test
@@ -2042,6 +2045,8 @@ share/mysql-test/t/rpl_variables-master.opt
 share/mysql-test/t/rpl_variables.test
 share/mysql-test/t/rpl_view.test
 share/mysql-test/t/schema.test
+share/mysql-test/t/secure_file_priv_win-master.opt
+share/mysql-test/t/secure_file_priv_win.test
 share/mysql-test/t/select.test
 share/mysql-test/t/select_found.test
 share/mysql-test/t/select_safe.test
@@ -2214,3 +2219,4 @@ share/mysql/slovak/errmsg.sys
 share/mysql/spanish/errmsg.sys
 share/mysql/swedish/errmsg.sys
 share/mysql/ukrainian/errmsg.sys
+@pkgdir share/mysql-test/collections
diff --git a/databases/mysql5-server/distinfo b/databases/mysql5-server/distinfo
index 9206c729d8b..a11f1fe974c 100644
--- a/databases/mysql5-server/distinfo
+++ b/databases/mysql5-server/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.28 2011/08/04 09:09:41 taca Exp $
+$NetBSD: distinfo,v 1.29 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) = 4517f9e7445ccb6e7cdd6eee44af4fe3d8dc9513
 SHA1 (patch-ab) = 7c51a0214c3e6205605047c72b07eac6792600db
 SHA1 (patch-ae) = dc67ad03f9ea370b17a45f73e974013e0ac48d71
@@ -18,13 +18,6 @@ SHA1 (patch-an) = 1f7ede981f2e7a846f49a5cfd443051acf9f3a02
 SHA1 (patch-ap) = 70049d00e30d89201dd8d9fc0ace4e6edfcffae7
 SHA1 (patch-aq) = e63b5be7cb1cb2e8ca8ee52e7e42632c05804959
 SHA1 (patch-bf) = 180aefb012a0d17269654ba0aeb71ec74ea98e6c
-SHA1 (patch-ca) = a1620b5ebad72bcf9265ec0f9b44ecebb2ee22c7
+SHA1 (patch-ca) = 34cd54409f459a8938c7068218d736b6c7916a5c
 SHA1 (patch-cb) = 3e6e3e5aeb0476b399ce80d7af58564cdad7da7a
 SHA1 (patch-cc) = 5dc7423892271cf9be86be71de10d275532a8541
-SHA1 (patch-include_my__time.h) = 369fb468388bdec4e8449927e2109a8839fdde8a
-SHA1 (patch-mysql-test_r_func__time.result) = c85c6ff7981adf9dd10a4d1724e0b94616dcbe1c
-SHA1 (patch-mysql-test_t_func__time.test) = 5ff59d3fb9486a34ab23f33a942c2bd16be87776
-SHA1 (patch-sql-common_my__time.c) = 8fa7f2f54cccf778c316e311dec8a39a87b9fc57
-SHA1 (patch-sql_mysqld.cc) = ae26b56f5ede21ed975005f47994b685b2c8083e
-SHA1 (patch-sql_set__var.cc) = 149b35a73c5b82094fc5188b872904aaeb9f2329
-SHA1 (patch-sql_sql__class.h) = 27fc6cc1684288b7ca517915af69a4ef8447c691
diff --git a/databases/mysql5-server/patches/patch-ca b/databases/mysql5-server/patches/patch-ca
index 923899b4e48..f769ebd63bd 100644
--- a/databases/mysql5-server/patches/patch-ca
+++ b/databases/mysql5-server/patches/patch-ca
@@ -1,28 +1,11 @@
-$NetBSD: patch-ca,v 1.4 2011/08/02 16:15:08 taca Exp $
+$NetBSD: patch-ca,v 1.5 2012/04/14 04:04:48 taca Exp $
 
-* Handling of time_t: http://lists.mysql.com/commits/128103
 * 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	2011-01-25 11:27:51.000000000 +0000
 +++ configure.in
-@@ -1956,6 +1956,15 @@ dnl
- 
- MYSQL_CHECK_TIME_T
- 
-+dnl
-+dnl check size of time_t
-+dnl
-+
-+AC_CHECK_SIZEOF(time_t, 8)
-+if test "$ac_cv_sizeof_time_t" -eq 0
-+then
-+  AC_MSG_ERROR("MySQL needs a time_t type.")
-+fi
- 
- # do we need #pragma interface/#pragma implementation ?
- # yes if it's gcc 2.x, and not icc pretending to be gcc, and not cygwin
 @@ -2051,7 +2060,7 @@ AC_CHECK_HEADERS(varargs.h stdarg.h dire
  paths.h semaphore.h)
  
diff --git a/databases/mysql5-server/patches/patch-include_my__time.h b/databases/mysql5-server/patches/patch-include_my__time.h
deleted file mode 100644
index 87c9a06f592..00000000000
--- a/databases/mysql5-server/patches/patch-include_my__time.h
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-include_my__time.h,v 1.1 2011/08/02 16:15:08 taca Exp $
-
-* Handling of time_t: http://lists.mysql.com/commits/128103
-
---- include/my_time.h.orig	2011-01-25 11:28:00.000000000 +0000
-+++ include/my_time.h
-@@ -44,6 +44,17 @@ typedef long my_time_t;
- #define MY_TIME_T_MIN LONG_MIN
- 
- 
-+/*
-+  check for valid times only if the range of time_t is greater than
-+  the range of my_time_t
-+*/
-+#if SIZEOF_TIME_T > SIZEOF_LONG
-+# define IS_VALID_TIME_T(x) ((x) <= (time_t) MY_TIME_T_MAX && \
-+			     (x) >= (time_t) MY_TIME_T_MIN)
-+#else
-+# define IS_VALID_TIME_T(x) (1 > 0)
-+#endif
-+
- /* Time handling defaults */
- #define TIMESTAMP_MAX_YEAR 2038
- #define YY_PART_YEAR	   70
diff --git a/databases/mysql5-server/patches/patch-mysql-test_r_func__time.result b/databases/mysql5-server/patches/patch-mysql-test_r_func__time.result
deleted file mode 100644
index 3bdfc217d48..00000000000
--- a/databases/mysql5-server/patches/patch-mysql-test_r_func__time.result
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-mysql-test_r_func__time.result,v 1.1 2011/08/02 16:15:08 taca Exp $
-
-* Handling of time_t: http://lists.mysql.com/commits/128103
-
---- mysql-test/r/func_time.result.orig	2011-01-25 11:52:36.000000000 +0000
-+++ mysql-test/r/func_time.result
-@@ -1323,4 +1323,15 @@ SELECT '2008-02-18' + INTERVAL 1 FRAC_SE
- ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FRAC_SECOND' at line 1
- SELECT '2008-02-18' - INTERVAL 1 FRAC_SECOND;
- ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FRAC_SECOND' at line 1
-+#
-+# Bug #52315 part 2 : utc_date() crashes when system time > year 2037
-+#
-+SET TIMESTAMP=-147490000;
-+SELECT UTC_TIMESTAMP();
-+SET TIMESTAMP=2147483648;
-+SELECT UTC_TIMESTAMP();
-+SET TIMESTAMP=2147483646;
-+SELECT UTC_TIMESTAMP();
-+SET TIMESTAMP=2147483647;
-+SELECT UTC_TIMESTAMP();
- End of 5.0 tests
diff --git a/databases/mysql5-server/patches/patch-mysql-test_t_func__time.test b/databases/mysql5-server/patches/patch-mysql-test_t_func__time.test
deleted file mode 100644
index 5cb060c664c..00000000000
--- a/databases/mysql5-server/patches/patch-mysql-test_t_func__time.test
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-mysql-test_t_func__time.test,v 1.1 2011/08/02 16:15:08 taca Exp $
-
-* Handling of time_t: http://lists.mysql.com/commits/128103
-
---- mysql-test/t/func_time.test.orig	2011-01-25 11:52:35.000000000 +0000
-+++ mysql-test/t/func_time.test
-@@ -838,4 +838,19 @@ SELECT '2008-02-18' + INTERVAL 1 FRAC_SE
- --error ER_PARSE_ERROR
- SELECT '2008-02-18' - INTERVAL 1 FRAC_SECOND;
- 
-+
-+--echo #
-+--echo # Bug #52315 part 2 : utc_date() crashes when system time > year 2037
-+--echo #
-+
-+--disable_result_log
-+--error ER_UNKNOWN_ERROR
-+SET TIMESTAMP=-147490000; SELECT UTC_TIMESTAMP();
-+--error ER_UNKNOWN_ERROR
-+SET TIMESTAMP=2147483648; SELECT UTC_TIMESTAMP();
-+SET TIMESTAMP=2147483646; SELECT UTC_TIMESTAMP();
-+SET TIMESTAMP=2147483647; SELECT UTC_TIMESTAMP();
-+--enable_result_log
-+
-+
- --echo End of 5.0 tests
diff --git a/databases/mysql5-server/patches/patch-sql-common_my__time.c b/databases/mysql5-server/patches/patch-sql-common_my__time.c
deleted file mode 100644
index 3b0df49a884..00000000000
--- a/databases/mysql5-server/patches/patch-sql-common_my__time.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-sql-common_my__time.c,v 1.2 2011/08/04 09:09:41 taca Exp $
-
-* Handling of time_t: http://lists.mysql.com/commits/128103
-
---- sql-common/my_time.c.orig	2011-01-25 11:28:00.000000000 +0000
-+++ sql-common/my_time.c
-@@ -984,8 +984,17 @@ my_system_gmt_sec(const MYSQL_TIME *t_sr
-     So, tmp < TIMESTAMP_MIN_VALUE will be triggered. On platfroms
-     with unsigned time_t tmp+= shift*86400L might result in a number,
-     larger then TIMESTAMP_MAX_VALUE, so another check will work.
-+
-+    tmp being larger than TIMESTAMP_MAX_VALUE can only happen on
-+    platforms where the size of time_t is larger than the size of
-+    TIMESTAMP_MAX_VALUE (currently INT32 : 4 bytes).
-+    #ifdef to avoid the compilation warnings on these platforms (OpenBSD).
-   */
--  if ((tmp < TIMESTAMP_MIN_VALUE) || (tmp > TIMESTAMP_MAX_VALUE))
-+  if ((tmp < TIMESTAMP_MIN_VALUE)
-+#if SIZEOF_TIME_T > 4
-+      || (tmp > TIMESTAMP_MAX_VALUE)
-+#endif
-+					)
-     tmp= 0;
- 
-   return (my_time_t) tmp;
diff --git a/databases/mysql5-server/patches/patch-sql_mysqld.cc b/databases/mysql5-server/patches/patch-sql_mysqld.cc
deleted file mode 100644
index 31d1797af7d..00000000000
--- a/databases/mysql5-server/patches/patch-sql_mysqld.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-sql_mysqld.cc,v 1.1 2011/08/02 16:15:08 taca Exp $
-
-* Handling of time_t: http://lists.mysql.com/commits/128103
-
---- sql/mysqld.cc.orig	2011-01-25 11:27:51.000000000 +0000
-+++ sql/mysqld.cc
-@@ -2836,13 +2836,6 @@ static int init_common_variables(const c
-   max_system_variables.pseudo_thread_id= (ulong)~0;
-   server_start_time= flush_status_time= time((time_t*) 0);
-   
--  /* TODO: remove this when my_time_t is 64 bit compatible */
--  if (server_start_time >= (time_t) MY_TIME_T_MAX)
--  {
--    sql_print_error("This MySQL server doesn't support dates later then 2038");
--    return 1;
--  }
--
-   if (init_thread_environment())
-     return 1;
-   mysql_init_variables();
-@@ -2882,6 +2875,13 @@ static int init_common_variables(const c
-   mysql_slow_log.init_pthread_objects();
-   mysql_bin_log.init_pthread_objects();
- 
-+  /* TODO: remove this when my_time_t is 64 bit compatible */
-+  if (!IS_VALID_TIME_T(server_start_time))
-+  {
-+    sql_print_error("This MySQL server doesn't support dates later then 2038");
-+    return 1;
-+  }
-+
-   if (gethostname(glob_hostname,sizeof(glob_hostname)) < 0)
-   {
-     strmake(glob_hostname, STRING_WITH_LEN("localhost"));
diff --git a/databases/mysql5-server/patches/patch-sql_set__var.cc b/databases/mysql5-server/patches/patch-sql_set__var.cc
deleted file mode 100644
index 549bef24ecf..00000000000
--- a/databases/mysql5-server/patches/patch-sql_set__var.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-sql_set__var.cc,v 1.2 2011/08/04 09:09:41 taca Exp $
-
-* Handling of time_t: http://lists.mysql.com/commits/128103
-
---- sql/set_var.cc.orig	2011-01-25 11:27:51.000000000 +0000
-+++ sql/set_var.cc
-@@ -2717,7 +2717,11 @@ bool sys_var_timestamp::check(THD *thd, 
-   time_t val;
-   var->save_result.ulonglong_value= var->value->val_int();
-   val= (time_t) var->save_result.ulonglong_value;
--  if (val < (time_t) MY_TIME_T_MIN || val > (time_t) MY_TIME_T_MAX)
-+  if ((val < TIMESTAMP_MIN_VALUE)
-+#if SIZEOF_TIME_T > 4
-+      || (val > TIMESTAMP_MAX_VALUE)
-+#endif
-+					)
-   {
-     my_message(ER_UNKNOWN_ERROR, 
-                "This version of MySQL doesn't support dates later than 2038",
diff --git a/databases/mysql5-server/patches/patch-sql_sql__class.h b/databases/mysql5-server/patches/patch-sql_sql__class.h
deleted file mode 100644
index d0b6d34ee33..00000000000
--- a/databases/mysql5-server/patches/patch-sql_sql__class.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-sql_sql__class.h,v 1.1 2011/08/02 16:15:08 taca Exp $
-
-* Handling of time_t: http://lists.mysql.com/commits/128103
-
---- sql/sql_class.h.orig	2011-01-25 11:27:51.000000000 +0000
-+++ sql/sql_class.h
-@@ -1710,7 +1710,7 @@ public:
-   /*TODO: this will be obsolete when we have support for 64 bit my_time_t */
-   inline bool	is_valid_time() 
-   { 
--    return (start_time < (time_t) MY_TIME_T_MAX); 
-+    return (IS_VALID_TIME_T(start_time));
-   }
-   inline void	insert_id(ulonglong id_arg)
-   {