Update mysql51-{client,server} package to 5.1.57.

This is simply maintenance release, no security fix.
Please refer http://dev.mysql.com/doc/refman/5.1/en/news-5-1-57.html in
detail.

6 files changed, 25 insertions, 39 deletions

diff --git a/databases/mysql51-client/Makefile.common b/databases/mysql51-client/Makefile.common
index 922935ab477..e5b7bc61d65 100644
--- a/databases/mysql51-client/Makefile.common
+++ b/databases/mysql51-client/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.18 2011/03/08 14:06:43 taca Exp $
+# $NetBSD: Makefile.common,v 1.19 2011/05/08 16:01:57 taca Exp $
 #
 # used by databases/mysql51-client/Makefile
 # used by databases/mysql51-server/Makefile
 #
 
-DISTNAME=		mysql-5.1.56
+DISTNAME=		mysql-5.1.57
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_MYSQL:=MySQL-5.1/}
 
diff --git a/databases/mysql51-client/distinfo b/databases/mysql51-client/distinfo
index b4280d17bce..1764010aa42 100644
--- a/databases/mysql51-client/distinfo
+++ b/databases/mysql51-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2011/03/18 05:39:58 adam Exp $
+$NetBSD: distinfo,v 1.17 2011/05/08 16:01:57 taca Exp $
 
-SHA1 (mysql-5.1.56.tar.gz) = 8665c76ab4ab36e8d2379ddf6d678c89b95d9321
-RMD160 (mysql-5.1.56.tar.gz) = c2ff6eb06d0797d4b56630b783d4ad2d1add1422
-Size (mysql-5.1.56.tar.gz) = 24795624 bytes
+SHA1 (mysql-5.1.57.tar.gz) = fcfe037ee6cfd53fe336ef12854e79481bdc6681
+RMD160 (mysql-5.1.57.tar.gz) = 9ca7f79d14525fef2c1badf8410fecd238ee283e
+Size (mysql-5.1.57.tar.gz) = 23660514 bytes
 SHA1 (patch-aa) = 344bc9ab7013fbf64be6adbe8a9fc6279887beb1
 SHA1 (patch-ab) = a1c699ebd9dc7e2cec9354035cbd9fdc2a411175
 SHA1 (patch-ac) = a250b9797fbaad51d054cbb324feb0f7c29096d4
@@ -14,7 +14,6 @@ SHA1 (patch-ah) = 715bef16c95e26f4abb39eb05fd23dbc9f7fa96b
 SHA1 (patch-ai) = 625474e24c6f6c7b921ffd1534fd2ff93fdf02c8
 SHA1 (patch-aj) = 5b67806269894c6f1725716f96433643260184db
 SHA1 (patch-ak) = af5309d7a5b48042368936c7540f90df3dc4aafe
-SHA1 (patch-al) = 93ba34d66fd054fbcf9e1eb3a042770d4d6820ec
 SHA1 (patch-am) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af
 SHA1 (patch-an) = a608060cee7aadaf8bcde84016a73131a75dea32
 SHA1 (patch-ao) = dbf68af2d2ded85140aac3602d4f6ce5d68cc78a
diff --git a/databases/mysql51-client/patches/patch-al b/databases/mysql51-client/patches/patch-al
deleted file mode 100644
index f97a3b71713..00000000000
--- a/databases/mysql51-client/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $
-
---- include/my_handler.h.orig	2010-02-04 11:37:06.000000000 +0000
-+++ include/my_handler.h
-@@ -39,7 +39,7 @@ extern "C" {
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
- 
--#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
- #define HA_MAX_KEY_SEG              16          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/mysql51-server/PLIST b/databases/mysql51-server/PLIST
index 1375d998500..1f98135ead9 100644
--- a/databases/mysql51-server/PLIST
+++ b/databases/mysql51-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2011/03/08 14:06:44 taca Exp $
+@comment $NetBSD: PLIST,v 1.15 2011/05/08 16:01:58 taca Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -331,6 +331,7 @@ share/mysql-test/include/no_valgrind_without_big.inc
 share/mysql-test/include/not_as_root.inc
 share/mysql-test/include/not_binlog_format_row.inc
 share/mysql-test/include/not_blackhole.inc
+share/mysql-test/include/not_crashrep.inc
 share/mysql-test/include/not_embedded.inc
 share/mysql-test/include/not_ndb.inc
 share/mysql-test/include/not_ndb_default.inc
@@ -636,6 +637,7 @@ share/mysql-test/r/func_default.result
 share/mysql-test/r/func_des_encrypt.result
 share/mysql-test/r/func_encrypt.result
 share/mysql-test/r/func_encrypt_nossl.result
+share/mysql-test/r/func_encrypt_ucs2.result
 share/mysql-test/r/func_equal.result
 share/mysql-test/r/func_gconcat.result
 share/mysql-test/r/func_group.result
@@ -967,6 +969,7 @@ share/mysql-test/r/sql_mode.result
 share/mysql-test/r/ssl-big.result
 share/mysql-test/r/ssl.result
 share/mysql-test/r/ssl_8k_key.result
+share/mysql-test/r/ssl_cipher.result
 share/mysql-test/r/ssl_compress.result
 share/mysql-test/r/ssl_connect.result
 share/mysql-test/r/status.result
@@ -2691,6 +2694,7 @@ share/mysql-test/suite/innodb/r/innodb_bug56680.result
 share/mysql-test/suite/innodb/r/innodb_bug56716.result
 share/mysql-test/suite/innodb/r/innodb_bug57252.result
 share/mysql-test/suite/innodb/r/innodb_bug57255.result
+share/mysql-test/suite/innodb/r/innodb_bug60049.result
 share/mysql-test/suite/innodb/r/innodb_gis.result
 share/mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result
 share/mysql-test/suite/innodb/r/innodb_misc1.result
@@ -2748,6 +2752,8 @@ share/mysql-test/suite/innodb/t/innodb_bug56680.test
 share/mysql-test/suite/innodb/t/innodb_bug56716.test
 share/mysql-test/suite/innodb/t/innodb_bug57252.test
 share/mysql-test/suite/innodb/t/innodb_bug57255.test
+share/mysql-test/suite/innodb/t/innodb_bug60049-master.opt
+share/mysql-test/suite/innodb/t/innodb_bug60049.test
 share/mysql-test/suite/innodb/t/innodb_gis.test
 share/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1-master.opt
 share/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test
@@ -2830,6 +2836,8 @@ share/mysql-test/suite/innodb_plugin/r/innodb_bug56716.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug56947.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug57252.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug57255.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug59307.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug60049.result
 share/mysql-test/suite/innodb_plugin/r/innodb_file_format.result
 share/mysql-test/suite/innodb_plugin/r/innodb_gis.result
 share/mysql-test/suite/innodb_plugin/r/innodb_information_schema.result
@@ -2917,6 +2925,9 @@ share/mysql-test/suite/innodb_plugin/t/innodb_bug56716.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug56947.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug57252.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug57255.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug59307.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug60049-master.opt
+share/mysql-test/suite/innodb_plugin/t/innodb_bug60049.test
 share/mysql-test/suite/innodb_plugin/t/innodb_file_format.test
 share/mysql-test/suite/innodb_plugin/t/innodb_gis.test
 share/mysql-test/suite/innodb_plugin/t/innodb_information_schema.test
@@ -4524,6 +4535,7 @@ share/mysql-test/t/func_des_encrypt.test
 share/mysql-test/t/func_encrypt-master.opt
 share/mysql-test/t/func_encrypt.test
 share/mysql-test/t/func_encrypt_nossl.test
+share/mysql-test/t/func_encrypt_ucs2.test
 share/mysql-test/t/func_equal.test
 share/mysql-test/t/func_gconcat.test
 share/mysql-test/t/func_group.test
@@ -4847,6 +4859,8 @@ share/mysql-test/t/ssl-big.test
 share/mysql-test/t/ssl.test
 share/mysql-test/t/ssl_8k_key-master.opt
 share/mysql-test/t/ssl_8k_key.test
+share/mysql-test/t/ssl_cipher-master.opt
+share/mysql-test/t/ssl_cipher.test
 share/mysql-test/t/ssl_compress.test
 share/mysql-test/t/ssl_connect.test
 share/mysql-test/t/status-master.opt
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index 0b21ca6ee01..ef4e0d65369 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.18 2011/03/19 15:40:15 jmmv Exp $
+$NetBSD: distinfo,v 1.19 2011/05/08 16:01:58 taca Exp $
 
-SHA1 (mysql-5.1.56.tar.gz) = 8665c76ab4ab36e8d2379ddf6d678c89b95d9321
-RMD160 (mysql-5.1.56.tar.gz) = c2ff6eb06d0797d4b56630b783d4ad2d1add1422
-Size (mysql-5.1.56.tar.gz) = 24795624 bytes
+SHA1 (mysql-5.1.57.tar.gz) = fcfe037ee6cfd53fe336ef12854e79481bdc6681
+RMD160 (mysql-5.1.57.tar.gz) = 9ca7f79d14525fef2c1badf8410fecd238ee283e
+Size (mysql-5.1.57.tar.gz) = 23660514 bytes
 SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506
 SHA1 (patch-ab) = 4c485a74d55553d63fc3dbc0350d0aa0068e1fcf
 SHA1 (patch-ac) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c
@@ -24,5 +24,4 @@ SHA1 (patch-ar) = ed9c062adce41a840db1e908ab0657db6de540ae
 SHA1 (patch-as) = 8167416a083a011ded19d176bc488c94d9eb7abf
 SHA1 (patch-at) = 307a0785190f8bc175226ce83288cc85f7da4631
 SHA1 (patch-au) = 51291771b994d199fb6de6a17dd7809a7bf39b68
-SHA1 (patch-aw) = 93ba34d66fd054fbcf9e1eb3a042770d4d6820ec
 SHA1 (patch-ax) = dbf68af2d2ded85140aac3602d4f6ce5d68cc78a
diff --git a/databases/mysql51-server/patches/patch-aw b/databases/mysql51-server/patches/patch-aw
deleted file mode 100644
index 5d36284d08d..00000000000
--- a/databases/mysql51-server/patches/patch-aw
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aw,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
-
---- include/my_handler.h.orig	2010-02-04 11:37:06.000000000 +0000
-+++ include/my_handler.h
-@@ -39,7 +39,7 @@ extern "C" {
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
- 
--#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
- #define HA_MAX_KEY_SEG              16          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)