Update mysql51-client and mysql51-server package to 5.1.58 (MySQL 5.1.58).

This is bug fix release.  Since whole changes are too many to write here,
please refer http://dev.mysql.com/doc/refman/5.1/en/news-5-1-58.html.

Especially, some important one for related to us.

* On FreeBSD 64-built builds of the embedded server, exceptions were not
  prevented from propagating into the embedded application. (Bug #38965,
  Bug #11749418)

5 files changed, 43 insertions, 38 deletions

diff --git a/databases/mysql51-client/Makefile.common b/databases/mysql51-client/Makefile.common
index e5b7bc61d65..cb456a1a74c 100644
--- a/databases/mysql51-client/Makefile.common
+++ b/databases/mysql51-client/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.19 2011/05/08 16:01:57 taca Exp $
+# $NetBSD: Makefile.common,v 1.20 2011/08/02 14:10:34 taca Exp $
 #
 # used by databases/mysql51-client/Makefile
 # used by databases/mysql51-server/Makefile
 #
 
-DISTNAME=		mysql-5.1.57
+DISTNAME=		mysql-5.1.58
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_MYSQL:=MySQL-5.1/}
 
diff --git a/databases/mysql51-client/distinfo b/databases/mysql51-client/distinfo
index 1764010aa42..329937473ef 100644
--- a/databases/mysql51-client/distinfo
+++ b/databases/mysql51-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2011/05/08 16:01:57 taca Exp $
+$NetBSD: distinfo,v 1.18 2011/08/02 14:10:34 taca Exp $
 
-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 (mysql-5.1.58.tar.gz) = cfd70bee07ad99576eecde01785b7b2a74ec87ab
+RMD160 (mysql-5.1.58.tar.gz) = 199729c701c764cd22584c2b952230c07d0f31a6
+Size (mysql-5.1.58.tar.gz) = 24333490 bytes
 SHA1 (patch-aa) = 344bc9ab7013fbf64be6adbe8a9fc6279887beb1
 SHA1 (patch-ab) = a1c699ebd9dc7e2cec9354035cbd9fdc2a411175
 SHA1 (patch-ac) = a250b9797fbaad51d054cbb324feb0f7c29096d4
@@ -23,7 +23,7 @@ SHA1 (patch-ar) = bc0e2083ec285be8adac1027e63bf076e4c57211
 SHA1 (patch-as) = 5eb3a9308b13a25fa813db0ed4a06f8e43db74f6
 SHA1 (patch-at) = c192492ef048399da01ea191586808319ce21dc5
 SHA1 (patch-au) = e454e1a4f4232e57f2105ac5150e1df0be709864
-SHA1 (patch-av) = b9a23506c947e8cfce5f92f0da5d2d3749220f8a
+SHA1 (patch-av) = b8fb1065d7e71522374a16d759d2f3ab5227f590
 SHA1 (patch-aw) = 50b811871b68506131020750f9af41e6834ec1cb
 SHA1 (patch-ax) = 390debbc31e710f5aa41fda6a8b1134a14a2ff23
 SHA1 (patch-ay) = 0b9c334c1e50c0c341e38d3fb189194de2d05b87
diff --git a/databases/mysql51-client/patches/patch-av b/databases/mysql51-client/patches/patch-av
index 648db611c3b..34f7141a0bb 100644
--- a/databases/mysql51-client/patches/patch-av
+++ b/databases/mysql51-client/patches/patch-av
@@ -1,15 +1,15 @@
-$NetBSD: patch-av,v 1.2 2010/09/21 15:57:30 taca Exp $
+$NetBSD: patch-av,v 1.3 2011/08/02 14:10:34 taca Exp $
 
 * Handle DragonFly as the same as FreeBSD.
 
---- sql/mysqld.cc.orig	2010-02-04 11:39:50.000000000 +0000
+--- sql/mysqld.cc.orig	2011-07-01 15:22:19.000000000 +0000
 +++ sql/mysqld.cc
-@@ -173,7 +173,7 @@ static void getvolumeID(BYTE *volumeName
+@@ -171,7 +171,7 @@ static void getvolumeID(BYTE *volumeName
  int initgroups(const char *,unsigned int);
  #endif
  
--#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H)
-+#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(HAVE_IEEEFP_H)
+-#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT)
++#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT)
  #include <ieeefp.h>
  #ifdef HAVE_FP_EXCEPT				// Fix type conflict
  typedef fp_except fp_except_t;
diff --git a/databases/mysql51-server/PLIST b/databases/mysql51-server/PLIST
index 1f98135ead9..4c0441afb2c 100644
--- a/databases/mysql51-server/PLIST
+++ b/databases/mysql51-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2011/05/08 16:01:58 taca Exp $
+@comment $NetBSD: PLIST,v 1.16 2011/08/02 14:10:34 taca Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -498,6 +498,7 @@ share/mysql-test/r/ansi.result
 share/mysql-test/r/archive-big.result
 share/mysql-test/r/archive.result
 share/mysql-test/r/archive_bitfield.result
+share/mysql-test/r/archive_debug.result
 share/mysql-test/r/archive_gis.result
 share/mysql-test/r/auto_increment.result
 share/mysql-test/r/backup.result
@@ -721,6 +722,7 @@ share/mysql-test/r/heap_auto_increment.result
 share/mysql-test/r/heap_btree.result
 share/mysql-test/r/heap_hash.result
 share/mysql-test/r/help.result
+share/mysql-test/r/implicit_char_to_num_conversion.result
 share/mysql-test/r/index_merge_innodb.result
 share/mysql-test/r/index_merge_myisam.result
 share/mysql-test/r/information_schema.result
@@ -880,8 +882,8 @@ share/mysql-test/r/partition_list.result
 share/mysql-test/r/partition_mgm.result
 share/mysql-test/r/partition_mgm_err.result
 share/mysql-test/r/partition_mgm_err2.result
+share/mysql-test/r/partition_myisam.result
 share/mysql-test/r/partition_not_blackhole.result
-share/mysql-test/r/partition_not_embedded.result
 share/mysql-test/r/partition_not_windows.result
 share/mysql-test/r/partition_open_files_limit.result
 share/mysql-test/r/partition_order.result
@@ -934,6 +936,7 @@ share/mysql-test/r/rpl_colSize.result
 share/mysql-test/r/rpl_extraColmaster_innodb.result
 share/mysql-test/r/rpl_extraColmaster_myisam.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
@@ -1196,6 +1199,8 @@ share/mysql-test/std_data/words.dat
 share/mysql-test/std_data/words2.dat
 share/mysql-test/suite/binlog/combinations
 share/mysql-test/suite/binlog/r/binlog_base64_flag.result
+share/mysql-test/suite/binlog/r/binlog_bug23533.result
+share/mysql-test/suite/binlog/r/binlog_bug36391.result
 share/mysql-test/suite/binlog/r/binlog_database.result
 share/mysql-test/suite/binlog/r/binlog_delete_and_flush_index.result
 share/mysql-test/suite/binlog/r/binlog_drop_if_exists.result
@@ -1212,6 +1217,7 @@ share/mysql-test/suite/binlog/r/binlog_mixed_load_data.result
 share/mysql-test/suite/binlog/r/binlog_multi_engine.result
 share/mysql-test/suite/binlog/r/binlog_old_versions.result
 share/mysql-test/suite/binlog/r/binlog_query_filter_rules.result
+share/mysql-test/suite/binlog/r/binlog_reset_master.result
 share/mysql-test/suite/binlog/r/binlog_row_binlog.result
 share/mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result
 share/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result
@@ -1256,6 +1262,9 @@ share/mysql-test/suite/binlog/std_data/ver_5_1_23.001
 share/mysql-test/suite/binlog/std_data/write-full-row.binlog
 share/mysql-test/suite/binlog/std_data/write-partial-row.binlog
 share/mysql-test/suite/binlog/t/binlog_base64_flag.test
+share/mysql-test/suite/binlog/t/binlog_bug23533.test
+share/mysql-test/suite/binlog/t/binlog_bug36391-master.opt
+share/mysql-test/suite/binlog/t/binlog_bug36391.test
 share/mysql-test/suite/binlog/t/binlog_database.test
 share/mysql-test/suite/binlog/t/binlog_delete_and_flush_index.test
 share/mysql-test/suite/binlog/t/binlog_drop_if_exists.test
@@ -1276,6 +1285,7 @@ share/mysql-test/suite/binlog/t/binlog_multi_engine.test
 share/mysql-test/suite/binlog/t/binlog_old_versions.test
 share/mysql-test/suite/binlog/t/binlog_query_filter_rules-master.opt
 share/mysql-test/suite/binlog/t/binlog_query_filter_rules.test
+share/mysql-test/suite/binlog/t/binlog_reset_master.test
 share/mysql-test/suite/binlog/t/binlog_row_binlog-master.opt
 share/mysql-test/suite/binlog/t/binlog_row_binlog.test
 share/mysql-test/suite/binlog/t/binlog_row_ctype_cp932.test
@@ -1318,25 +1328,6 @@ share/mysql-test/suite/binlog/t/binlog_truncate_myisam.test
 share/mysql-test/suite/binlog/t/binlog_unsafe.test
 share/mysql-test/suite/binlog/t/binlog_write_error.test
 share/mysql-test/suite/binlog/t/disabled.def
-share/mysql-test/suite/bugs/combinations
-share/mysql-test/suite/bugs/data/rpl_bug12691.dat
-share/mysql-test/suite/bugs/r/rpl_bug12691.result
-share/mysql-test/suite/bugs/r/rpl_bug23533.result
-share/mysql-test/suite/bugs/r/rpl_bug31582.result
-share/mysql-test/suite/bugs/r/rpl_bug31583.result
-share/mysql-test/suite/bugs/r/rpl_bug33029.result
-share/mysql-test/suite/bugs/r/rpl_bug36391.result
-share/mysql-test/suite/bugs/r/rpl_bug37426.result
-share/mysql-test/suite/bugs/r/rpl_bug38205.result
-share/mysql-test/suite/bugs/t/rpl_bug12691.test
-share/mysql-test/suite/bugs/t/rpl_bug23533.test
-share/mysql-test/suite/bugs/t/rpl_bug31582.test
-share/mysql-test/suite/bugs/t/rpl_bug31583.test
-share/mysql-test/suite/bugs/t/rpl_bug33029.test
-share/mysql-test/suite/bugs/t/rpl_bug36391-master.opt
-share/mysql-test/suite/bugs/t/rpl_bug36391.test
-share/mysql-test/suite/bugs/t/rpl_bug37426.test
-share/mysql-test/suite/bugs/t/rpl_bug38205.test
 share/mysql-test/suite/engines/README
 share/mysql-test/suite/engines/funcs/r/ai_init_alter_table.result
 share/mysql-test/suite/engines/funcs/r/ai_init_create_table.result
@@ -2694,6 +2685,8 @@ 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_bug59410.result
+share/mysql-test/suite/innodb/r/innodb_bug59641.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
@@ -2752,6 +2745,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_bug59410.test
+share/mysql-test/suite/innodb/t/innodb_bug59641.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
@@ -2837,6 +2832,8 @@ 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_bug59410.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug59641.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
@@ -2926,6 +2923,8 @@ 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_bug59410.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug59641.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
@@ -3644,6 +3643,7 @@ share/mysql-test/suite/rpl/r/rpl_blackhole.result
 share/mysql-test/suite/rpl/r/rpl_bug26395.result
 share/mysql-test/suite/rpl/r/rpl_bug31076.result
 share/mysql-test/suite/rpl/r/rpl_bug33931.result
+share/mysql-test/suite/rpl/r/rpl_bug37426.result
 share/mysql-test/suite/rpl/r/rpl_bug38694.result
 share/mysql-test/suite/rpl/r/rpl_change_master.result
 share/mysql-test/suite/rpl/r/rpl_charset.result
@@ -3906,6 +3906,7 @@ share/mysql-test/suite/rpl/t/rpl_blackhole.test
 share/mysql-test/suite/rpl/t/rpl_bug26395.test
 share/mysql-test/suite/rpl/t/rpl_bug31076.test
 share/mysql-test/suite/rpl/t/rpl_bug33931.test
+share/mysql-test/suite/rpl/t/rpl_bug37426.test
 share/mysql-test/suite/rpl/t/rpl_bug38694-slave.opt
 share/mysql-test/suite/rpl/t/rpl_bug38694.test
 share/mysql-test/suite/rpl/t/rpl_change_master.test
@@ -4379,6 +4380,7 @@ share/mysql-test/t/ansi.test
 share/mysql-test/t/archive-big.test
 share/mysql-test/t/archive.test
 share/mysql-test/t/archive_bitfield.test
+share/mysql-test/t/archive_debug.test
 share/mysql-test/t/archive_gis.test
 share/mysql-test/t/auto_increment.test
 share/mysql-test/t/backup-master.sh
@@ -4578,6 +4580,7 @@ share/mysql-test/t/heap_auto_increment.test
 share/mysql-test/t/heap_btree.test
 share/mysql-test/t/heap_hash.test
 share/mysql-test/t/help.test
+share/mysql-test/t/implicit_char_to_num_conversion.test
 share/mysql-test/t/index_merge_innodb.test
 share/mysql-test/t/index_merge_myisam.test
 share/mysql-test/t/information_schema.test
@@ -4765,9 +4768,9 @@ share/mysql-test/t/partition_list.test
 share/mysql-test/t/partition_mgm.test
 share/mysql-test/t/partition_mgm_err.test
 share/mysql-test/t/partition_mgm_err2.test
+share/mysql-test/t/partition_myisam.test
 share/mysql-test/t/partition_not_blackhole-master.opt
 share/mysql-test/t/partition_not_blackhole.test
-share/mysql-test/t/partition_not_embedded.test
 share/mysql-test/t/partition_not_windows-master.opt
 share/mysql-test/t/partition_not_windows.test
 share/mysql-test/t/partition_open_files_limit-master.opt
@@ -4822,6 +4825,8 @@ share/mysql-test/t/round.test
 share/mysql-test/t/row.test
 share/mysql-test/t/rowid_order_innodb.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
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index ef4e0d65369..70eb8a5921c 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2011/05/08 16:01:58 taca Exp $
+$NetBSD: distinfo,v 1.20 2011/08/02 14:10:35 taca Exp $
 
-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 (mysql-5.1.58.tar.gz) = cfd70bee07ad99576eecde01785b7b2a74ec87ab
+RMD160 (mysql-5.1.58.tar.gz) = 199729c701c764cd22584c2b952230c07d0f31a6
+Size (mysql-5.1.58.tar.gz) = 24333490 bytes
 SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506
 SHA1 (patch-ab) = 4c485a74d55553d63fc3dbc0350d0aa0068e1fcf
 SHA1 (patch-ac) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c