Pullup ticket #3366 - requested by taca

databases/mysql5-{client,server} security fixes.

Revisions pulled up:
- databases/mysql5-client/Makefile.common                       1.41
- databases/mysql5-client/distinfo                              1.30
- databases/mysql5-client/patches/patch-ad                      1.8
- databases/mysql5-client/patches/patch-af                      1.9
- databases/mysql5-server/PLIST                                 1.17
- databases/mysql5-server/distinfo                              1.26
- databases/mysql5-server/patches/patch-aa                      1.7
- databases/mysql5-server/patches/patch-ag                      1.9
- databases/mysql5-server/patches/patch-ah                      1.8
---
Module Name:	pkgsrc
Module Name:	pkgsrc
Committed By:	taca
Date:		Sat Feb 26 02:58:56 UTC 2011

Modified Files:
	pkgsrc/databases/mysql5-client: Makefile.common distinfo
	pkgsrc/databases/mysql5-client/patches: patch-ad patch-af
	pkgsrc/databases/mysql5-server: PLIST distinfo
	pkgsrc/databases/mysql5-server/patches: patch-aa patch-ag patch-ah

Log Message:
Update mysql5-{client,server} pacakge to 5.0.92.

Functionality added or changed:

* The time zone tables available at
  http://dev.mysql.com/downloads/timezones.html have been
  updated. These tables can be used on systems such as Windows or
  HP-UX that do not include zoneinfo files. (Bug#40230)

Bugs fixed:

* Security Fix: During evaluation of arguments to extreme-value
  functions (such as LEAST() and GREATEST()), type errors did not
  propagate properly, causing the server to crash. (Bug#55826,
  CVE-2010-3833)

* Security Fix: The server could crash after materializing a derived
  table that required a temporary table for grouping. (Bug#55568,
  CVE-2010-3834)

* Security Fix: A user-variable assignment expression that is
  evaluated in a logical expression context can be precalculated in a
  temporary table for GROUP BY. However, when the expression value is
  used after creation of the temporary table, it was re-evaluated, not
  read from the table and a server crash resulted. (Bug#55564,
  CVE-2010-3835)

* Security Fix: Joins involving a table with a unique SET column could
  cause a server crash. (Bug#54575, CVE-2010-3677)

* Security Fix: Pre-evaluation of LIKE predicates during view
  preparation could cause a server crash. (Bug#54568, CVE-2010-3836)

* Security Fix: GROUP_CONCAT() and WITH ROLLUP together could cause a
  server crash. (Bug#54476, CVE-2010-3837)

* Security Fix: Queries could cause a server crash if the GREATEST()
  or LEAST() function had a mixed list of numeric and LONGBLOB
  arguments, and the result of such a function was processed using an
  intermediate temporary table. (Bug#54461, CVE-2010-3838)

* Security Fix: Using EXPLAIN with queries of the form SELECT
  ... UNION ... ORDER BY (SELECT ... WHERE ...) could cause a server
  crash. (Bug#52711, CVE-2010-3682)

* InnoDB Storage Engine: Creating or dropping a table with 1023
  transactions active caused an assertion failure. (Bug#49238)

* The make_binary_distribution target to make could fail on some
  platforms because the lines generated were too long for the
  shell. (Bug#54590)

* A client could supply data in chunks to a prepared statement
  parameter other than of type TEXT or BLOB using the
  mysql_stmt_send_long_data() C API function (or
  COM_STMT_SEND_LONG_DATA command). This led to a crash because other
  data types are not valid for long data. (Bug#54041)

* Builds of the embedded mysqld would fail due to a missing element of
  the struct NET. (Bug#53908, Bug#53912)

* The definition of the MY_INIT macro in my_sys.h included an
  extraneous semicolon, which could cause compilation
  failure. (Bug#53906)

* If the remote server for a FEDERATED table could not be accessed,
  queries for the INFORMATION_SCHEMA.TABLES table failed. (Bug#35333)

* mysqld could fail during execution when using SSL. (Bug#34236)

* Threads that were calculating the estimated number of records for a
  range scan did not respond to the KILL statement. That is, if a
  range join type is possible (even if not selected by the optimizer
  as a join type of choice and thus not shown by EXPLAIN), the query
  in the statistics state (shown by the SHOW PROCESSLIST) did not
  respond to the KILL statement. (Bug#25421)

9 files changed, 39 insertions, 37 deletions

diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common
index 9d36ae03cfc..e881f5b1249 100644
--- a/databases/mysql5-client/Makefile.common
+++ b/databases/mysql5-client/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.40 2010/11/15 16:24:09 sketch Exp $
+# $NetBSD: Makefile.common,v 1.40.2.1 2011/03/01 08:28:32 sbd Exp $
 #
 # used by databases/mysql5-client/Makefile
 # used by databases/mysql5-server/Makefile
 #
 
-DISTNAME=		mysql-5.0.91
+DISTNAME=		mysql-5.0.92
 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 4e4f70e93f3..cb5372474e4 100644
--- a/databases/mysql5-client/distinfo
+++ b/databases/mysql5-client/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.29 2010/06/02 13:34:45 taca Exp $
+$NetBSD: distinfo,v 1.29.6.1 2011/03/01 08:28:32 sbd Exp $
 
-SHA1 (mysql-5.0.91.tar.gz) = 14a79138a1296ce6ebb681fceba622d870feba3e
-RMD160 (mysql-5.0.91.tar.gz) = 3aaa638172f6916d3698c5421b24a01647f7e9db
-Size (mysql-5.0.91.tar.gz) = 22340514 bytes
+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 (patch-aa) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
 SHA1 (patch-ab) = ee8103143b47a428319fbc25cf2f9a69828c15f7
 SHA1 (patch-ac) = 66b6d0ffd3011df1dcf8f3be7f7300e975635d95
-SHA1 (patch-ad) = 430b8ae2d13598eec90cfdc73d37d932dd97f217
+SHA1 (patch-ad) = 1cf8853882d60a2391d7eb41e9830dd89a8a58ce
 SHA1 (patch-ae) = f19a31c810bbccdda48c647743a819fdf58b195f
-SHA1 (patch-af) = 9e3ebe7eb161c7ed27bf13f1fb4969ac923ae859
+SHA1 (patch-af) = ed4a2fc3ed01b114157b20952ec4dbf2cf3d73b8
 SHA1 (patch-ag) = dea43cde5695c04b1b9a9e919828d97d3e049c08
 SHA1 (patch-ah) = 18f9bb2c6d9b88d04b9ade6177212ab2ed21b4d7
 SHA1 (patch-ai) = 317c20011478c631b7d150bf84e82c9c5fbb0a76
diff --git a/databases/mysql5-client/patches/patch-ad b/databases/mysql5-client/patches/patch-ad
index 6dff882dcdd..82af64bf468 100644
--- a/databases/mysql5-client/patches/patch-ad
+++ b/databases/mysql5-client/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.7 2007/10/12 14:32:46 rillig Exp $
+$NetBSD: patch-ad,v 1.7.30.1 2011/03/01 08:28:33 sbd Exp $
 
---- Makefile.in.orig	2007-07-04 14:10:07.000000000 +0100
-+++ Makefile.in	2007-07-15 17:20:48.000000000 +0100
-@@ -374,12 +374,7 @@
+--- Makefile.in.orig	2011-01-25 11:32:06.000000000 +0000
++++ Makefile.in
+@@ -376,12 +376,7 @@ AUTOMAKE_OPTIONS = foreign
  EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
- 			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
+ 			README COPYING CMakeLists.txt
  
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
 -			@readline_topdir@ sql-common scripts \
diff --git a/databases/mysql5-client/patches/patch-af b/databases/mysql5-client/patches/patch-af
index 13efae8d5ee..deba4217fb6 100644
--- a/databases/mysql5-client/patches/patch-af
+++ b/databases/mysql5-client/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.8 2010/02/18 15:46:10 taca Exp $
+$NetBSD: patch-af,v 1.8.8.1 2011/03/01 08:28:33 sbd Exp $
 
---- man/Makefile.in.orig	2010-01-15 09:53:44.000000000 +0000
+--- man/Makefile.in.orig	2011-01-25 11:31:45.000000000 +0000
 +++ man/Makefile.in
-@@ -349,8 +349,9 @@ yassl_h_ln_cmd = @yassl_h_ln_cmd@
- yassl_libs = @yassl_libs@
+@@ -350,8 +350,9 @@ yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
+ yassl_thread_cxxflags = @yassl_thread_cxxflags@
  zlib_dir = @zlib_dir@
 -man1_MANS = @man1_files@
 -man8_MANS = @man8_files@
diff --git a/databases/mysql5-server/PLIST b/databases/mysql5-server/PLIST
index 4c4dee9c6c1..933c5f1fd64 100644
--- a/databases/mysql5-server/PLIST
+++ b/databases/mysql5-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2010/02/18 15:46:10 taca Exp $
+@comment $NetBSD: PLIST,v 1.16.8.1 2011/03/01 08:28:33 sbd Exp $
 bin/comp_err
 bin/innochecksum
 bin/my_print_defaults
@@ -273,6 +273,7 @@ share/mysql-test/r/federated.result
 share/mysql-test/r/federated_archive.result
 share/mysql-test/r/federated_bug_13118.result
 share/mysql-test/r/federated_bug_25714.result
+share/mysql-test/r/federated_bug_35333.result
 share/mysql-test/r/federated_debug.result
 share/mysql-test/r/federated_disabled.result
 share/mysql-test/r/federated_innodb.result
@@ -1545,6 +1546,7 @@ share/mysql-test/t/federated.test
 share/mysql-test/t/federated_archive.test
 share/mysql-test/t/federated_bug_13118.test
 share/mysql-test/t/federated_bug_25714.test
+share/mysql-test/t/federated_bug_35333.test
 share/mysql-test/t/federated_debug-master.opt
 share/mysql-test/t/federated_debug.test
 share/mysql-test/t/federated_disabled-master.opt
diff --git a/databases/mysql5-server/distinfo b/databases/mysql5-server/distinfo
index 749b61f6961..c9b5a40aa4e 100644
--- a/databases/mysql5-server/distinfo
+++ b/databases/mysql5-server/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.25 2010/06/02 13:34:45 taca Exp $
+$NetBSD: distinfo,v 1.25.6.1 2011/03/01 08:28:33 sbd Exp $
 
-SHA1 (mysql-5.0.91.tar.gz) = 14a79138a1296ce6ebb681fceba622d870feba3e
-RMD160 (mysql-5.0.91.tar.gz) = 3aaa638172f6916d3698c5421b24a01647f7e9db
-Size (mysql-5.0.91.tar.gz) = 22340514 bytes
-SHA1 (patch-aa) = f52745512abfb2c2d43715975f76c2f454ed93e5
+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 (patch-aa) = 4517f9e7445ccb6e7cdd6eee44af4fe3d8dc9513
 SHA1 (patch-ab) = 7c51a0214c3e6205605047c72b07eac6792600db
 SHA1 (patch-ae) = dc67ad03f9ea370b17a45f73e974013e0ac48d71
 SHA1 (patch-af) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
-SHA1 (patch-ag) = abc6b85dd7d72b980f0768166eb77618d50e5102
-SHA1 (patch-ah) = 822f1f0eace49ff44f03e708056b88e480443c15
+SHA1 (patch-ag) = 9b859106d70e266147a31abf4554312269aa799c
+SHA1 (patch-ah) = 4a4f0071a9eab19eec3dcfb2e2cc7bbcf4849c20
 SHA1 (patch-ai) = 56d3f66a903224b8d27213480e7ea3e485e52f1d
 SHA1 (patch-aj) = b8516c18b1c2be5b3492ece583e9b8a85b89331a
 SHA1 (patch-ak) = 27698a132b42519e267dda0584a75eae1b74edea
diff --git a/databases/mysql5-server/patches/patch-aa b/databases/mysql5-server/patches/patch-aa
index 58e00239cfa..02a54739282 100644
--- a/databases/mysql5-server/patches/patch-aa
+++ b/databases/mysql5-server/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.6 2010/02/18 15:46:10 taca Exp $
+$NetBSD: patch-aa,v 1.6.8.1 2011/03/01 08:28:33 sbd Exp $
 
---- Makefile.in.orig	2010-01-15 09:54:05.000000000 +0000
+--- Makefile.in.orig	2011-01-25 11:32:06.000000000 +0000
 +++ Makefile.in
-@@ -375,12 +375,8 @@ AUTOMAKE_OPTIONS = foreign
+@@ -376,12 +376,8 @@ AUTOMAKE_OPTIONS = foreign
  EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
- 			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
+ 			README COPYING CMakeLists.txt
  
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
 -			@readline_topdir@ sql-common scripts \
diff --git a/databases/mysql5-server/patches/patch-ag b/databases/mysql5-server/patches/patch-ag
index 71495e50a9a..54ad0625530 100644
--- a/databases/mysql5-server/patches/patch-ag
+++ b/databases/mysql5-server/patches/patch-ag
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.8 2010/02/18 15:46:10 taca Exp $
+$NetBSD: patch-ag,v 1.8.8.1 2011/03/01 08:28:33 sbd Exp $
 
---- man/Makefile.in.orig	2010-01-15 09:53:44.000000000 +0000
+--- man/Makefile.in.orig	2011-01-25 11:31:45.000000000 +0000
 +++ man/Makefile.in
-@@ -349,7 +349,7 @@ yassl_h_ln_cmd = @yassl_h_ln_cmd@
- yassl_libs = @yassl_libs@
+@@ -350,7 +350,7 @@ yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
+ yassl_thread_cxxflags = @yassl_thread_cxxflags@
  zlib_dir = @zlib_dir@
 -man1_MANS = @man1_files@
 +man1_MANS = mysqld_multi.1
diff --git a/databases/mysql5-server/patches/patch-ah b/databases/mysql5-server/patches/patch-ah
index 0b48b874770..ba199616fed 100644
--- a/databases/mysql5-server/patches/patch-ah
+++ b/databases/mysql5-server/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.7 2010/02/18 15:46:10 taca Exp $
+$NetBSD: patch-ah,v 1.7.8.1 2011/03/01 08:28:33 sbd Exp $
 
---- include/Makefile.in.orig	2010-01-15 09:53:42.000000000 +0000
+--- include/Makefile.in.orig	2011-01-25 11:31:43.000000000 +0000
 +++ include/Makefile.in
-@@ -363,13 +363,7 @@ HEADERS_GEN = mysql_version.h my_config.
+@@ -364,13 +364,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
  
@@ -15,5 +15,5 @@ $NetBSD: patch-ah,v 1.7 2010/02/18 15:46:10 taca Exp $
 -			m_ctype.h my_attribute.h $(HEADERS_GEN)
 +pkginclude_HEADERS = 
  
- noinst_HEADERS = config-win.h config-os2.h config-netware.h \
+ noinst_HEADERS = config-win.h config-netware.h \
  			heap.h my_bitmap.h\