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

Secunia Advisory SA40333 (http://secunia.com/advisories/40333/) reports
that this release fixes DoS problem and it refers:

	http://dev.mysql.com/doc/refman/5.1/en/news-5-1-48.html
	http://bugs.mysql.com/bug.php?id=53804

But news-5-1-48.html dosen't contains about bug id 53804...

Anyway, please refer http://dev.mysql.com/doc/refman/5.1/en/news-5-1-48.html
for full changes.

4 files changed, 41 insertions, 16 deletions

diff --git a/databases/mysql51-client/Makefile.common b/databases/mysql51-client/Makefile.common
index 7ab3cfbe9a4..5c4de9ac28c 100644
--- a/databases/mysql51-client/Makefile.common
+++ b/databases/mysql51-client/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.8 2010/05/26 01:52:21 taca Exp $
+# $NetBSD: Makefile.common,v 1.9 2010/07/05 03:15:04 taca Exp $
 #
 # used by databases/mysql51-client/Makefile
 # used by databases/mysql51-server/Makefile
 #
 
-DISTNAME=		mysql-5.1.47
+DISTNAME=		mysql-5.1.48
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_MYSQL:=MySQL-5.1/}
 
diff --git a/databases/mysql51-client/distinfo b/databases/mysql51-client/distinfo
index 5ea95d6e8c7..4ea1621fe53 100644
--- a/databases/mysql51-client/distinfo
+++ b/databases/mysql51-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2010/05/26 01:52:21 taca Exp $
+$NetBSD: distinfo,v 1.5 2010/07/05 03:15:04 taca Exp $
 
-SHA1 (mysql-5.1.47.tar.gz) = 9ea8b2cfedb366b884eaeb37757de1cdbbd85b45
-RMD160 (mysql-5.1.47.tar.gz) = ee399fe1ba393c9cd4c19ec43ccea68a6a9f43e3
-Size (mysql-5.1.47.tar.gz) = 23817441 bytes
+SHA1 (mysql-5.1.48.tar.gz) = 61327d8588a73eb1ca61a91eefad9ce571bac588
+RMD160 (mysql-5.1.48.tar.gz) = 783575f5dc4ef004c8256878e6619d23cc33aae4
+Size (mysql-5.1.48.tar.gz) = 23362742 bytes
 SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506
 SHA1 (patch-ab) = 8bbbb84d659810031162475917ec233951c67ca4
 SHA1 (patch-ac) = 5d5f1b67eb96254b821cf4a3e99eec26dd703bf6
diff --git a/databases/mysql51-server/PLIST b/databases/mysql51-server/PLIST
index 3bbca287b00..16c760e88f3 100644
--- a/databases/mysql51-server/PLIST
+++ b/databases/mysql51-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2010/05/26 01:52:22 taca Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/07/05 03:15:04 taca Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -152,6 +152,7 @@ share/mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test
 share/mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test
 share/mysql-test/extra/rpl_tests/rpl_not_null.test
 share/mysql-test/extra/rpl_tests/rpl_partition.test
+share/mysql-test/extra/rpl_tests/rpl_record_compare.test
 share/mysql-test/extra/rpl_tests/rpl_relayrotate.test
 share/mysql-test/extra/rpl_tests/rpl_reset_slave.test
 share/mysql-test/extra/rpl_tests/rpl_row_001.test
@@ -180,7 +181,14 @@ share/mysql-test/include/big_test.inc
 share/mysql-test/include/binlog_inject_error.inc
 share/mysql-test/include/check-testcase.test
 share/mysql-test/include/check-warnings.test
+share/mysql-test/include/check_concurrent_insert.inc
 share/mysql-test/include/check_events_off.inc
+share/mysql-test/include/check_no_concurrent_insert.inc
+share/mysql-test/include/check_no_row_lock.inc
+share/mysql-test/include/check_shared_row_lock.inc
+share/mysql-test/include/check_slave_is_running.inc
+share/mysql-test/include/check_slave_no_error.inc
+share/mysql-test/include/check_slave_param.inc
 share/mysql-test/include/check_var_limit.inc
 share/mysql-test/include/circular_rpl_for_4_hosts_init.inc
 share/mysql-test/include/circular_rpl_for_4_hosts_sync.inc
@@ -210,6 +218,7 @@ share/mysql-test/include/diff_master_slave.inc
 share/mysql-test/include/diff_tables.inc
 share/mysql-test/include/endspace.inc
 share/mysql-test/include/get_binlog_dump_thread_id.inc
+share/mysql-test/include/get_relay_log_pos.inc
 share/mysql-test/include/gis_generic.inc
 share/mysql-test/include/gis_keys.inc
 share/mysql-test/include/grant_cache.inc
@@ -361,7 +370,6 @@ share/mysql-test/include/show_msg.inc
 share/mysql-test/include/show_msg80.inc
 share/mysql-test/include/show_rpl_debug_info.inc
 share/mysql-test/include/show_slave_status.inc
-share/mysql-test/include/show_slave_status2.inc
 share/mysql-test/include/sp-vars.inc
 share/mysql-test/include/start_slave.inc
 share/mysql-test/include/stop_slave.inc
@@ -694,6 +702,7 @@ share/mysql-test/r/innodb_gis.result
 share/mysql-test/r/innodb_ignore_builtin.result
 share/mysql-test/r/innodb_lock_wait_timeout_1.result
 share/mysql-test/r/innodb_mysql.result
+share/mysql-test/r/innodb_mysql_lock2.result
 share/mysql-test/r/innodb_mysql_rbk.result
 share/mysql-test/r/innodb_notembedded.result
 share/mysql-test/r/innodb_timeout_rollback.result
@@ -723,6 +732,7 @@ share/mysql-test/r/lock.result
 share/mysql-test/r/lock_multi.result
 share/mysql-test/r/lock_multi_bug38499.result
 share/mysql-test/r/lock_multi_bug38691.result
+share/mysql-test/r/lock_sync.result
 share/mysql-test/r/lock_tables_lost_commit.result
 share/mysql-test/r/log_state.result
 share/mysql-test/r/log_tables-big.result
@@ -2619,9 +2629,12 @@ share/mysql-test/suite/innodb/r/innodb_bug45357.result
 share/mysql-test/suite/innodb/r/innodb_bug46000.result
 share/mysql-test/suite/innodb/r/innodb_bug47621.result
 share/mysql-test/suite/innodb/r/innodb_bug47777.result
+share/mysql-test/suite/innodb/r/innodb_bug48024.result
+share/mysql-test/suite/innodb/r/innodb_bug49164.result
 share/mysql-test/suite/innodb/r/innodb_bug51920.result
 share/mysql-test/suite/innodb/r/innodb_bug52663.result
 share/mysql-test/suite/innodb/r/innodb_misc1.result
+share/mysql-test/suite/innodb/r/innodb_multi_update.result
 share/mysql-test/suite/innodb/r/innodb_trx_weight.result
 share/mysql-test/suite/innodb/t/disabled.def
 share/mysql-test/suite/innodb/t/innodb-autoinc-44030.test
@@ -2648,11 +2661,14 @@ share/mysql-test/suite/innodb/t/innodb_bug45357.test
 share/mysql-test/suite/innodb/t/innodb_bug46000.test
 share/mysql-test/suite/innodb/t/innodb_bug47621.test
 share/mysql-test/suite/innodb/t/innodb_bug47777.test
+share/mysql-test/suite/innodb/t/innodb_bug48024.test
+share/mysql-test/suite/innodb/t/innodb_bug49164.test
 share/mysql-test/suite/innodb/t/innodb_bug51920.test
 share/mysql-test/suite/innodb/t/innodb_bug52663-master.opt
 share/mysql-test/suite/innodb/t/innodb_bug52663.test
 share/mysql-test/suite/innodb/t/innodb_misc1-master.opt
 share/mysql-test/suite/innodb/t/innodb_misc1.test
+share/mysql-test/suite/innodb/t/innodb_multi_update.test
 share/mysql-test/suite/innodb/t/innodb_trx_weight.test
 share/mysql-test/suite/jp/include/trim_sjis.inc
 share/mysql-test/suite/jp/r/jp_alter_sjis.result
@@ -3189,6 +3205,7 @@ share/mysql-test/suite/parts/r/partition_char_innodb.result
 share/mysql-test/suite/parts/r/partition_char_myisam.result
 share/mysql-test/suite/parts/r/partition_datetime_innodb.result
 share/mysql-test/suite/parts/r/partition_datetime_myisam.result
+share/mysql-test/suite/parts/r/partition_debug_sync_innodb.result
 share/mysql-test/suite/parts/r/partition_decimal_innodb.result
 share/mysql-test/suite/parts/r/partition_decimal_myisam.result
 share/mysql-test/suite/parts/r/partition_engine_innodb.result
@@ -3267,6 +3284,8 @@ share/mysql-test/suite/parts/t/partition_char_innodb.test
 share/mysql-test/suite/parts/t/partition_char_myisam.test
 share/mysql-test/suite/parts/t/partition_datetime_innodb.test
 share/mysql-test/suite/parts/t/partition_datetime_myisam.test
+share/mysql-test/suite/parts/t/partition_debug_sync_innodb-master.opt
+share/mysql-test/suite/parts/t/partition_debug_sync_innodb.test
 share/mysql-test/suite/parts/t/partition_decimal_innodb.test
 share/mysql-test/suite/parts/t/partition_decimal_myisam.test
 share/mysql-test/suite/parts/t/partition_engine_innodb.test
@@ -3334,7 +3353,6 @@ share/mysql-test/suite/rpl/r/rpl000010.result
 share/mysql-test/suite/rpl/r/rpl000011.result
 share/mysql-test/suite/rpl/r/rpl000013.result
 share/mysql-test/suite/rpl/r/rpl000017.result
-share/mysql-test/suite/rpl/r/rpl_000015.result
 share/mysql-test/suite/rpl/r/rpl_EE_err.result
 share/mysql-test/suite/rpl/r/rpl_LD_INFILE.result
 share/mysql-test/suite/rpl/r/rpl_alter.result
@@ -3495,6 +3513,8 @@ share/mysql-test/suite/rpl/r/rpl_row_log_innodb.result
 share/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result
 share/mysql-test/suite/rpl/r/rpl_row_multi_query.result
 share/mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result
+share/mysql-test/suite/rpl/r/rpl_row_rec_comp_innodb.result
+share/mysql-test/suite/rpl/r/rpl_row_rec_comp_myisam.result
 share/mysql-test/suite/rpl/r/rpl_row_reset_slave.result
 share/mysql-test/suite/rpl/r/rpl_row_sp001.result
 share/mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result
@@ -3588,9 +3608,6 @@ share/mysql-test/suite/rpl/t/rpl000013.test
 share/mysql-test/suite/rpl/t/rpl000017-slave.opt
 share/mysql-test/suite/rpl/t/rpl000017-slave.sh
 share/mysql-test/suite/rpl/t/rpl000017.test
-share/mysql-test/suite/rpl/t/rpl_000015-slave.opt
-share/mysql-test/suite/rpl/t/rpl_000015.cnf
-share/mysql-test/suite/rpl/t/rpl_000015.test
 share/mysql-test/suite/rpl/t/rpl_EE_err.test
 share/mysql-test/suite/rpl/t/rpl_LD_INFILE.test
 share/mysql-test/suite/rpl/t/rpl_alter.test
@@ -3818,6 +3835,8 @@ share/mysql-test/suite/rpl/t/rpl_row_log_innodb.test
 share/mysql-test/suite/rpl/t/rpl_row_max_relay_size.test
 share/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog-master.opt
 share/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
+share/mysql-test/suite/rpl/t/rpl_row_rec_comp_innodb.test
+share/mysql-test/suite/rpl/t/rpl_row_rec_comp_myisam.test
 share/mysql-test/suite/rpl/t/rpl_row_reset_slave.test
 share/mysql-test/suite/rpl/t/rpl_row_sp001.test
 share/mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test
@@ -3955,6 +3974,7 @@ share/mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result
 share/mysql-test/suite/rpl_ndb/r/rpl_ndb_load.result
 share/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result
 share/mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_engines_transactions.result
+share/mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_tables.result
 share/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result
 share/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result
 share/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result
@@ -4023,6 +4043,9 @@ share/mysql-test/suite/rpl_ndb/t/rpl_ndb_log.test
 share/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions-master.opt
 share/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions-slave.opt
 share/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test
+share/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables-master.opt
+share/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables-slave.opt
+share/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test
 share/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test
 share/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2-slave.opt
 share/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test
@@ -4302,6 +4325,7 @@ share/mysql-test/t/innodb_lock_wait_timeout_1-master.opt
 share/mysql-test/t/innodb_lock_wait_timeout_1.test
 share/mysql-test/t/innodb_mysql-master.opt
 share/mysql-test/t/innodb_mysql.test
+share/mysql-test/t/innodb_mysql_lock2.test
 share/mysql-test/t/innodb_mysql_rbk-master.opt
 share/mysql-test/t/innodb_mysql_rbk.test
 share/mysql-test/t/innodb_notembedded.test
@@ -4331,6 +4355,7 @@ share/mysql-test/t/lock.test
 share/mysql-test/t/lock_multi.test
 share/mysql-test/t/lock_multi_bug38499.test
 share/mysql-test/t/lock_multi_bug38691.test
+share/mysql-test/t/lock_sync.test
 share/mysql-test/t/lock_tables_lost_commit-master.opt
 share/mysql-test/t/lock_tables_lost_commit.test
 share/mysql-test/t/log_state-master.opt
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index 58f39f6d1ad..001de1c9dd1 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2010/05/26 01:52:22 taca Exp $
+$NetBSD: distinfo,v 1.7 2010/07/05 03:15:04 taca Exp $
 
-SHA1 (mysql-5.1.47.tar.gz) = 9ea8b2cfedb366b884eaeb37757de1cdbbd85b45
-RMD160 (mysql-5.1.47.tar.gz) = ee399fe1ba393c9cd4c19ec43ccea68a6a9f43e3
-Size (mysql-5.1.47.tar.gz) = 23817441 bytes
+SHA1 (mysql-5.1.48.tar.gz) = 61327d8588a73eb1ca61a91eefad9ce571bac588
+RMD160 (mysql-5.1.48.tar.gz) = 783575f5dc4ef004c8256878e6619d23cc33aae4
+Size (mysql-5.1.48.tar.gz) = 23362742 bytes
 SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506
 SHA1 (patch-ab) = 39ca30e2e78645bb6975d057ace30e8c91e6e405
 SHA1 (patch-ac) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c