Changes 5.1.62:

* New utf8_general_mysql500_ci and ucs2_general_mysql500_ci collations have
  been added that preserve the behavior of utf8_general_ci and ucs2_general_ci
  from versions of MySQL previous to 5.1.24. Bug 27877 corrected an error in
  the original collations but introduced an incompatibility for columns that
  contain German 'ß' LATIN SMALL LETTER SHARP S. (As a result of the fix, that
  character compares equal to characters with which it previously compared
  different.) A symptom of the problem after upgrading to MySQL 5.1.24 or newer
  from a version older than 5.1.24 is that CHECK TABLE produces this error:
* yaSSL was upgraded from version 1.7.2 to 2.2.0.
* Bugs Fixed

5 files changed, 28 insertions, 13 deletions

diff --git a/databases/mysql51-client/Makefile.common b/databases/mysql51-client/Makefile.common
index cca12da9abd..518c015415e 100644
--- a/databases/mysql51-client/Makefile.common
+++ b/databases/mysql51-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.23 2012/03/09 11:55:11 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.24 2012/04/08 19:10:59 adam Exp $
 #
 # used by databases/mysql51-client/Makefile
 # used by databases/mysql51-server/Makefile
 
-DISTNAME=	mysql-5.1.61
+DISTNAME=	mysql-5.1.62
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.1/}
 
diff --git a/databases/mysql51-client/distinfo b/databases/mysql51-client/distinfo
index 6ed9a8ec1d5..4ac356279ab 100644
--- a/databases/mysql51-client/distinfo
+++ b/databases/mysql51-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2012/01/12 17:41:21 adam Exp $
+$NetBSD: distinfo,v 1.21 2012/04/08 19:10:59 adam Exp $
 
-SHA1 (mysql-5.1.61.tar.gz) = a528cf822af84601dd95d3e1cb3277815685ac65
-RMD160 (mysql-5.1.61.tar.gz) = 392b7394a0f7821134f177a3ba4580a29d60e3f4
-Size (mysql-5.1.61.tar.gz) = 24462261 bytes
+SHA1 (mysql-5.1.62.tar.gz) = 06c7b3742f21fee6faf46224de2221230f943f63
+RMD160 (mysql-5.1.62.tar.gz) = c5720deee2b04a40a20f56a3b305b37fecb343fe
+Size (mysql-5.1.62.tar.gz) = 24503313 bytes
 SHA1 (patch-aa) = 344bc9ab7013fbf64be6adbe8a9fc6279887beb1
 SHA1 (patch-ab) = a1c699ebd9dc7e2cec9354035cbd9fdc2a411175
 SHA1 (patch-ac) = a250b9797fbaad51d054cbb324feb0f7c29096d4
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index b6e67c22e80..9485e6e9978 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2012/01/23 09:23:13 sbd Exp $
+# $NetBSD: Makefile,v 1.11 2012/04/08 19:10:58 adam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
-PKGREVISION=		1
 SVR4_PKGNAME=		mysqs
 COMMENT=		MySQL 5, a free SQL database (server)
 
diff --git a/databases/mysql51-server/PLIST b/databases/mysql51-server/PLIST
index 9f558c568f4..a979175c789 100644
--- a/databases/mysql51-server/PLIST
+++ b/databases/mysql51-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2012/01/12 17:41:21 adam Exp $
+@comment $NetBSD: PLIST,v 1.19 2012/04/08 19:10:58 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -2660,7 +2660,10 @@ share/mysql-test/suite/innodb/r/innodb-semi-consistent.result
 share/mysql-test/suite/innodb/r/innodb-ucs2.result
 share/mysql-test/suite/innodb/r/innodb.result
 share/mysql-test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
+share/mysql-test/suite/innodb/r/innodb_bug11754376.result
+share/mysql-test/suite/innodb/r/innodb_bug12400341.result
 share/mysql-test/suite/innodb/r/innodb_bug12661768.result
+share/mysql-test/suite/innodb/r/innodb_bug13510739.result
 share/mysql-test/suite/innodb/r/innodb_bug21704.result
 share/mysql-test/suite/innodb/r/innodb_bug30423.result
 share/mysql-test/suite/innodb/r/innodb_bug30919.result
@@ -2716,7 +2719,11 @@ share/mysql-test/suite/innodb/t/innodb-ucs2.test
 share/mysql-test/suite/innodb/t/innodb.test
 share/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt
 share/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
+share/mysql-test/suite/innodb/t/innodb_bug11754376.test
+share/mysql-test/suite/innodb/t/innodb_bug12400341-master.opt
+share/mysql-test/suite/innodb/t/innodb_bug12400341.test
 share/mysql-test/suite/innodb/t/innodb_bug12661768.test
+share/mysql-test/suite/innodb/t/innodb_bug13510739.test
 share/mysql-test/suite/innodb/t/innodb_bug21704.test
 share/mysql-test/suite/innodb/t/innodb_bug30423.test
 share/mysql-test/suite/innodb/t/innodb_bug30919-master.opt
@@ -2780,6 +2787,7 @@ share/mysql-test/suite/innodb_plugin/r/innodb-autoinc-44030.result
 share/mysql-test/suite/innodb_plugin/r/innodb-autoinc-56228.result
 share/mysql-test/suite/innodb_plugin/r/innodb-autoinc-optimize.result
 share/mysql-test/suite/innodb_plugin/r/innodb-autoinc.result
+share/mysql-test/suite/innodb_plugin/r/innodb-blob.result
 share/mysql-test/suite/innodb_plugin/r/innodb-consistent.result
 share/mysql-test/suite/innodb_plugin/r/innodb-create-options.result
 share/mysql-test/suite/innodb_plugin/r/innodb-index.result
@@ -2793,6 +2801,9 @@ share/mysql-test/suite/innodb_plugin/r/innodb-use-sys-malloc.result
 share/mysql-test/suite/innodb_plugin/r/innodb-zip.result
 share/mysql-test/suite/innodb_plugin/r/innodb.result
 share/mysql-test/suite/innodb_plugin/r/innodb_autoinc_lock_mode_zero.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug11754376.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug12400341.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug13510739.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug21704.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug30423.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug30919.result
@@ -2864,6 +2875,7 @@ share/mysql-test/suite/innodb_plugin/t/innodb-autoinc-56228-master.opt
 share/mysql-test/suite/innodb_plugin/t/innodb-autoinc-56228.test
 share/mysql-test/suite/innodb_plugin/t/innodb-autoinc-optimize.test
 share/mysql-test/suite/innodb_plugin/t/innodb-autoinc.test
+share/mysql-test/suite/innodb_plugin/t/innodb-blob.test
 share/mysql-test/suite/innodb_plugin/t/innodb-consistent-master.opt
 share/mysql-test/suite/innodb_plugin/t/innodb-consistent.test
 share/mysql-test/suite/innodb_plugin/t/innodb-create-options.test
@@ -2882,6 +2894,10 @@ share/mysql-test/suite/innodb_plugin/t/innodb-zip.test
 share/mysql-test/suite/innodb_plugin/t/innodb.test
 share/mysql-test/suite/innodb_plugin/t/innodb_autoinc_lock_mode_zero-master.opt
 share/mysql-test/suite/innodb_plugin/t/innodb_autoinc_lock_mode_zero.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug11754376.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug12400341-master.opt
+share/mysql-test/suite/innodb_plugin/t/innodb_bug12400341.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug13510739.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug21704.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug30423.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug30919-master.opt
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index c6b737900e6..226ce94eaae 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.23 2012/03/09 12:38:27 fhajny Exp $
+$NetBSD: distinfo,v 1.24 2012/04/08 19:10:58 adam Exp $
 
-SHA1 (mysql-5.1.61.tar.gz) = a528cf822af84601dd95d3e1cb3277815685ac65
-RMD160 (mysql-5.1.61.tar.gz) = 392b7394a0f7821134f177a3ba4580a29d60e3f4
-Size (mysql-5.1.61.tar.gz) = 24462261 bytes
+SHA1 (mysql-5.1.62.tar.gz) = 06c7b3742f21fee6faf46224de2221230f943f63
+RMD160 (mysql-5.1.62.tar.gz) = c5720deee2b04a40a20f56a3b305b37fecb343fe
+Size (mysql-5.1.62.tar.gz) = 24503313 bytes
 SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506
 SHA1 (patch-ab) = 4c485a74d55553d63fc3dbc0350d0aa0068e1fcf
 SHA1 (patch-ac) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c