Changes 5.5.15:

* The undocumented --all option for perror is deprecated and will be removed in
  MySQL 5.6.
Bugs Fixed:
* InnoDB Storage Engine: A failed CREATE INDEX operation for an InnoDB table
  could result in some memory being allocated and not freed. This memory leak
  could affect tables created with the ROW_FORMAT=DYNAMIC and
  ROW_FORMAT=COMPRESSED settings.
* Partitioning: Auto-increment columns of partitioned tables were checked even
  when they were not being written to. In debug builds, this could lead to a
  crash of the server.
* Partitioning: The UNIX_TIMESTAMP() function was not treated as a monotonic
  function for purposes of partition pruning.
* Replication: If a LOAD DATA INFILE statement—replicated using statement-based
  replication—featured a SET clause, the name-value pairs were regenerated
  using a method (Item::print()) intended primarily for generating output for
  statements such as EXPLAIN EXTENDED, and which cannot be relied on to return
  valid SQL. This could in certain cases lead to a crash on the slave.
* To fix this problem, we now name each value in its original, user-supplied
  form, and use that to create LOAD DATA INFILE statements for statement-based
  replication.
* Previously, an inappropriate error message was produced if a multiple-table
  update for an InnoDB table with a clustered primary key would update a table
  through multiple aliases, and perform an update that may physically move the
  row in at least one of these aliases. Now the error message is: Primary
  key/partition key update is not allowed since the table is updated both as
  'tbl_name1' and 'tbl_name2'
* ALTER TABLE {MODIFY|CHANGE} ... FIRST did nothing except rename columns if
  the old and new versions of the table had exactly the same structure with
  respect to column data types. As a result, the mapping of column name to
  column data was incorrect. The same thing happened for ALTER TABLE DROP
  COLUMN, ADD COLUMN statements intended to produce a new version of table with
  exactly the same structure as the old version.
* Incorrect handling of metadata locking for FLUSH TABLES WITH READ LOCK for
  statements requiring prelocking caused two problems:
* Execution of any data-changing statement that required prelocking (that is,
  involved a stored function or trigger) as part of transaction slowed down
  somewhat all subsequent statements in the transaction. Performance in a
  transaction that periodically involved such statements gradually degraded
  over time.

3 files changed, 9 insertions, 7 deletions

diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index cb54280ac1d..dcaa7f5ace0 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.7 2011/07/08 09:32:07 adam Exp $
+# $NetBSD: Makefile.common,v 1.8 2011/07/28 08:10:29 adam Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.14
+DISTNAME=	mysql-5.5.15
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
 
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index e910412fcd9..3347bdfb084 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2011/07/08 09:32:07 adam Exp $
+$NetBSD: distinfo,v 1.5 2011/07/28 08:10:29 adam Exp $
 
-SHA1 (mysql-5.5.14.tar.gz) = 3b17e20be4e8bcc0f94392fb444f4a09f80de2e4
-RMD160 (mysql-5.5.14.tar.gz) = 1c84fc3967691e9eedd1b90df780a9d738a709c4
-Size (mysql-5.5.14.tar.gz) = 23772997 bytes
+SHA1 (mysql-5.5.15.tar.gz) = c89be9fe209d74b62a5e5e71e099dad1e0674a87
+RMD160 (mysql-5.5.15.tar.gz) = 536bdcc576583b2ca5b937c1db237dab02453237
+Size (mysql-5.5.15.tar.gz) = 23774015 bytes
 SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
 SHA1 (patch-CMakeLists.txt) = 5e990e40e1e8a5d558315a38b6596c8fa4227e7b
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
diff --git a/databases/mysql55-server/PLIST b/databases/mysql55-server/PLIST
index 94a5dc644f6..4a3b1ca1e08 100644
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2011/07/08 09:32:07 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/07/28 08:10:29 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -1007,6 +1007,7 @@ share/mysql/test/r/mysql.result
 share/mysql/test/r/mysql_client_test.result
 share/mysql/test/r/mysql_comments.result
 share/mysql/test/r/mysql_cp932.result
+share/mysql/test/r/mysql_embedded.result
 share/mysql/test/r/mysql_locale_posix.result
 share/mysql/test/r/mysql_not_windows.result
 share/mysql/test/r/mysql_protocols.result
@@ -5821,6 +5822,7 @@ share/mysql/test/t/mysql_cp932.test
 share/mysql/test/t/mysql_delimiter.sql
 share/mysql/test/t/mysql_delimiter_19799.sql
 share/mysql/test/t/mysql_delimiter_source.sql
+share/mysql/test/t/mysql_embedded.test
 share/mysql/test/t/mysql_locale_posix.test
 share/mysql/test/t/mysql_not_windows.test
 share/mysql/test/t/mysql_protocols.test