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

Functionality added or changed:

* Support for the IBMDB2I storage engine has been removed. (Bug#58079)

* The pstack library was nonfunctional and has been removed, along with the
  --with-pstack option for configure. The --enable-pstack option for mysqld is
  deprecated and will be removed in MySQL 5.5. (Bug#57210)

Bugs fixed:

* Performance: InnoDB Storage Engine: Improved concurrency when several
  ANALYZE TABLE or SHOW TABLE STATUS statements are run simultaneously for
  InnoDB tables. (Bug#53046)

* InnoDB Storage Engine: For an InnoDB table created with
  ROW_FORMAT=COMPRESSED or ROW_FORMAT=DYNAMIC, a query using the READ
  UNCOMMITTED isolation level could cause the server to stop with an assertion
  error, if BLOB or other large columns that use off-page storage were being
  inserted at the same time. (Bug#57799)

* Partitioning: An INSERT ... ON DUPLICATE KEY UPDATE column = 0 statement on
  an AUTO_INCREMENT column caused the debug server to crash. (Bug#57890)

* Several compilation problems were fixed. (Bug#57992, Bug#57993, Bug#57994,
  Bug#57995, Bug#57996, Bug#57997, Bug#58057)

* Passing a string that was not null-terminated to UpdateXML() or
  ExtractValue() caused the server to fail with an assertion. (Bug#57279)

* Queries executed using the Index Merge access method and a temporary file
  could return incorrect results. (Bug#56862)

* The find_files() function used by SHOW statements performed redundant and
  unnecessary memory allocation. (Bug#51208)

6 files changed, 31 insertions, 28 deletions

diff --git a/databases/mysql51-client/Makefile.common b/databases/mysql51-client/Makefile.common
index ecbec261bd9..8ae54c790b5 100644
--- a/databases/mysql51-client/Makefile.common
+++ b/databases/mysql51-client/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.15 2010/11/26 13:52:58 taca Exp $
+# $NetBSD: Makefile.common,v 1.16 2010/12/16 03:42:49 taca Exp $
 #
 # used by databases/mysql51-client/Makefile
 # used by databases/mysql51-server/Makefile
 #
 
-DISTNAME=		mysql-5.1.53
+DISTNAME=		mysql-5.1.54
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_MYSQL:=MySQL-5.1/}
 
diff --git a/databases/mysql51-client/distinfo b/databases/mysql51-client/distinfo
index acce1371bf7..ce620310f39 100644
--- a/databases/mysql51-client/distinfo
+++ b/databases/mysql51-client/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.11 2010/11/26 13:52:58 taca Exp $
+$NetBSD: distinfo,v 1.12 2010/12/16 03:42:49 taca Exp $
 
-SHA1 (mysql-5.1.53.tar.gz) = 24064a4c0f8b88b30acb6ddb03f32e897ef061f3
-RMD160 (mysql-5.1.53.tar.gz) = e8fd69450dda85cf3f41269e6e3fca05caccc76d
-Size (mysql-5.1.53.tar.gz) = 23871815 bytes
+SHA1 (mysql-5.1.54.tar.gz) = c3d1fb7c1985529e7dcdc689ac7977cfff007c9c
+RMD160 (mysql-5.1.54.tar.gz) = f9252c9a62278b4a6e17d47bc901be3732c32b18
+Size (mysql-5.1.54.tar.gz) = 23672236 bytes
 SHA1 (patch-aa) = 344bc9ab7013fbf64be6adbe8a9fc6279887beb1
-SHA1 (patch-ab) = 7258ade5c4d9aa26cb1b1a93aac9da2f7ed92c2c
+SHA1 (patch-ab) = 66ea5217d98d33e1be44e4dda754a94496f1ea44
 SHA1 (patch-ac) = a250b9797fbaad51d054cbb324feb0f7c29096d4
 SHA1 (patch-ad) = 4e98f696b8b5098456e53a8de710a6bcd547997c
 SHA1 (patch-ae) = 5373aeea5d67d8d1cbee1fa4d04c03227b544e3d
diff --git a/databases/mysql51-client/patches/patch-ab b/databases/mysql51-client/patches/patch-ab
index ca621ffbc40..7697975baa5 100644
--- a/databases/mysql51-client/patches/patch-ab
+++ b/databases/mysql51-client/patches/patch-ab
@@ -1,16 +1,15 @@
-$NetBSD: patch-ab,v 1.2 2010/09/21 15:57:30 taca Exp $
+$NetBSD: patch-ab,v 1.3 2010/12/16 03:42:49 taca Exp $
 
 * process directories in client package.
 
---- Makefile.in.orig	2010-02-04 11:46:48.000000000 +0000
+--- Makefile.in.orig	2010-11-29 10:42:58.000000000 +0000
 +++ Makefile.in
-@@ -407,14 +407,8 @@ AUTOMAKE_OPTIONS = foreign
+@@ -407,13 +407,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@ \
 -			@readline_topdir@ sql-common scripts \
--			@pstack_dir@ \
 -			@sql_union_dirs@ unittest \
 -			@sql_server@ @man_dirs@ tests \
 -			netware @libmysqld_dirs@ \
diff --git a/databases/mysql51-server/PLIST b/databases/mysql51-server/PLIST
index 0b07300c043..95c8560ce11 100644
--- a/databases/mysql51-server/PLIST
+++ b/databases/mysql51-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2010/11/26 13:52:58 taca Exp $
+@comment $NetBSD: PLIST,v 1.12 2010/12/16 03:42:50 taca Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -101,6 +101,8 @@ share/mysql-test/collections/default.daily
 share/mysql-test/collections/default.experimental
 share/mysql-test/collections/default.push
 share/mysql-test/collections/default.weekly
+share/mysql-test/collections/mysql-5.1-bugteam.daily
+share/mysql-test/collections/mysql-5.1-bugteam.push
 share/mysql-test/extra/binlog_tests/binlog.test
 share/mysql-test/extra/binlog_tests/binlog_failure_mixing_engines.test
 share/mysql-test/extra/binlog_tests/binlog_insert_delayed.test
@@ -1226,6 +1228,7 @@ share/mysql-test/suite/binlog/t/binlog_delete_and_flush_index.test
 share/mysql-test/suite/binlog/t/binlog_grant.test
 share/mysql-test/suite/binlog/t/binlog_incident-master.opt
 share/mysql-test/suite/binlog/t/binlog_incident.test
+share/mysql-test/suite/binlog/t/binlog_index-master.opt
 share/mysql-test/suite/binlog/t/binlog_index.test
 share/mysql-test/suite/binlog/t/binlog_innodb.test
 share/mysql-test/suite/binlog/t/binlog_innodb_row.test
@@ -2728,6 +2731,7 @@ share/mysql-test/suite/innodb_plugin/r/innodb-autoinc-44030.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-consistent.result
+share/mysql-test/suite/innodb_plugin/r/innodb-create-options.result
 share/mysql-test/suite/innodb_plugin/r/innodb-index.result
 share/mysql-test/suite/innodb_plugin/r/innodb-index_ucs2.result
 share/mysql-test/suite/innodb_plugin/r/innodb-lock.result
@@ -2770,6 +2774,7 @@ share/mysql-test/suite/innodb_plugin/r/innodb_bug51378.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug51920.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug52663.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug52745.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug53046.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug53290.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug53591.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug53592.result
@@ -2777,9 +2782,7 @@ share/mysql-test/suite/innodb_plugin/r/innodb_bug53674.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug53756.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug54044.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug54453.result
-share/mysql-test/suite/innodb_plugin/r/innodb_bug54679.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug56143.result
-share/mysql-test/suite/innodb_plugin/r/innodb_bug56632.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug56680.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug56716.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug56947.result
@@ -2802,6 +2805,7 @@ 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-consistent-master.opt
 share/mysql-test/suite/innodb_plugin/t/innodb-consistent.test
+share/mysql-test/suite/innodb_plugin/t/innodb-create-options.test
 share/mysql-test/suite/innodb_plugin/t/innodb-index.test
 share/mysql-test/suite/innodb_plugin/t/innodb-index_ucs2.test
 share/mysql-test/suite/innodb_plugin/t/innodb-lock.test
@@ -2851,6 +2855,7 @@ share/mysql-test/suite/innodb_plugin/t/innodb_bug51378.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug51920.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug52663.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug52745.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug53046.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug53290.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug53591.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug53592.test
@@ -2860,9 +2865,7 @@ share/mysql-test/suite/innodb_plugin/t/innodb_bug53756-master.opt
 share/mysql-test/suite/innodb_plugin/t/innodb_bug53756.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug54044.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug54453.test
-share/mysql-test/suite/innodb_plugin/t/innodb_bug54679.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug56143.test
-share/mysql-test/suite/innodb_plugin/t/innodb_bug56632.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug56680.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug56716.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug56947.test
@@ -3867,6 +3870,7 @@ share/mysql-test/suite/rpl/t/rpl_create_tmp_table_if_not_exists.test
 share/mysql-test/suite/rpl/t/rpl_critical_errors.test
 share/mysql-test/suite/rpl/t/rpl_cross_version-master.opt
 share/mysql-test/suite/rpl/t/rpl_cross_version.test
+share/mysql-test/suite/rpl/t/rpl_current_user-master.opt
 share/mysql-test/suite/rpl/t/rpl_current_user.cnf
 share/mysql-test/suite/rpl/t/rpl_current_user.test
 share/mysql-test/suite/rpl/t/rpl_ddl.test
@@ -4098,6 +4102,7 @@ share/mysql-test/suite/rpl/t/rpl_slave_grp_exec.test
 share/mysql-test/suite/rpl/t/rpl_slave_load_in.test
 share/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile-slave.opt
 share/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
+share/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-master.opt
 share/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-slave.opt
 share/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test
 share/mysql-test/suite/rpl/t/rpl_slave_skip.test
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index 2c91e5d6ed2..d9982b6644c 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2010/11/26 13:52:58 taca Exp $
+$NetBSD: distinfo,v 1.14 2010/12/16 03:42:50 taca Exp $
 
-SHA1 (mysql-5.1.53.tar.gz) = 24064a4c0f8b88b30acb6ddb03f32e897ef061f3
-RMD160 (mysql-5.1.53.tar.gz) = e8fd69450dda85cf3f41269e6e3fca05caccc76d
-Size (mysql-5.1.53.tar.gz) = 23871815 bytes
+SHA1 (mysql-5.1.54.tar.gz) = c3d1fb7c1985529e7dcdc689ac7977cfff007c9c
+RMD160 (mysql-5.1.54.tar.gz) = f9252c9a62278b4a6e17d47bc901be3732c32b18
+Size (mysql-5.1.54.tar.gz) = 23672236 bytes
 SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506
-SHA1 (patch-ab) = 39ca30e2e78645bb6975d057ace30e8c91e6e405
+SHA1 (patch-ab) = 1fc6939bb3021153b72479aa2413e50940878c98
 SHA1 (patch-ac) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c
 SHA1 (patch-ad) = 5fd4db0e04a97289f38a5467bbae5041f4082b51
 SHA1 (patch-ae) = e682e8c7a260706cbfd802885bfe100c0e0d31be
diff --git a/databases/mysql51-server/patches/patch-ab b/databases/mysql51-server/patches/patch-ab
index 1d8760f6784..c39905112a2 100644
--- a/databases/mysql51-server/patches/patch-ab
+++ b/databases/mysql51-server/patches/patch-ab
@@ -1,20 +1,19 @@
-$NetBSD: patch-ab,v 1.2 2010/03/21 14:41:41 taca Exp $
+$NetBSD: patch-ab,v 1.3 2010/12/16 03:42:50 taca Exp $
 
---- Makefile.in.orig	2010-02-04 11:46:48.000000000 +0000
+--- Makefile.in.orig	2010-11-29 10:42:58.000000000 +0000
 +++ Makefile.in
-@@ -407,14 +407,10 @@ AUTOMAKE_OPTIONS = foreign
+@@ -407,13 +407,10 @@ 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@ \
 -			@readline_topdir@ sql-common scripts \
--			@pstack_dir@ \
 -			@sql_union_dirs@ unittest \
 -			@sql_server@ @man_dirs@ tests \
 -			netware @libmysqld_dirs@ \
 -			mysql-test support-files sql-bench @tools_dirs@ \
 -			win
-+SUBDIRS = . include scripts @pstack_dir@ \
++SUBDIRS = . include scripts \
 +			strings mysys dbug extra regex storage plugin \
 +			libmysql @sql_server@ @man_dirs@ tests \
 +			@libmysqld_dirs@ mysql-test support-files @tools_dirs@