Changes 5.5.13:

* InnoDB Storage Engine: If the server crashed while an XA transaction was
  prepared but not yet committed, the transaction could remain in the system
  after restart, and cause a subsequent shutdown to hang.
* InnoDB Storage Engine: Similar problem to the foreign key error in bug
  11831040 / 60196 / 60909, but with a different root cause and occurring on
  Mac OS X. With the setting lower_case_table_names=2, inserts into InnoDB
  tables covered by foreign key constraints could fail after a server restart.
* Partitioning: The internal get_partition_set() function did not take into
  account the possibility that a key specification could be NULL in some cases.
* Partitioning: When executing a row-ordered retrieval index merge, the
  partitioning handler used memory from from that allocated for the table,
  rather than that allocated to the query, causing table object memory not to
  be freed until the table was closed.
* Replication: A spurious error malformed binlog: it does not contain any
  Format_description_log_event... was generated when mysqlbinlog was invoked
  using --base64-output=decode-row and --start-position=pos, where pos is a
  point in the binary log past the format description log event. However, there
  is nothing unsafe about not printing the format description log event, so the
  error has been removed for this case.
* Replication: Typographical errors appeared in the text of several replication  error messages. (The word “position” was misspelled as “postion”.)
* Assignments to NEW.var_name within triggers, where var_name had a BLOB or
  TEXT type, were not properly handled and produced incorrect results.
* XA COMMIT could fail to clean up the error state if it discovered that the
  current XA transaction had to be rolled back. Consequently, the next XA
  transaction could raise an assertion when it checked for proper cleanup of
  the previous transaction.
* An internal client macro reference was removed from the client_plugin.h
  header file. This reference made the file unusable.
* The server consumed memory for repeated invocation of some stored procedures,
  which was not released until the connection terminated.
* The server did not check for certain invalid out of order sequences of XA
  statements, and these sequences raised an assertion.
* With the conversion from GNU autotools to CMake for configuring MySQL, the
  USE_SYMDIR preprocessor symbol was omitted. This caused failure of symbolic
  links (described at Section 7.11.3.1, “Using Symbolic Links”).

3 files changed, 18 insertions, 29 deletions

diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index d2c5bb19975..00d88828b02 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.5 2011/05/09 13:06:28 adam Exp $
+# $NetBSD: Makefile.common,v 1.6 2011/06/15 21:00:05 adam Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.12
+DISTNAME=	mysql-5.5.13
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
 
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index d6246860a26..3a791f3fa0c 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2011/05/07 04:03:07 adam Exp $
+$NetBSD: distinfo,v 1.3 2011/06/15 21:00:05 adam Exp $
 
-SHA1 (mysql-5.5.12.tar.gz) = 8a4f4c2b762676140722d414d694cddd9c1e3397
-RMD160 (mysql-5.5.12.tar.gz) = e36d6a29e4f92eecfbbdac47d9f0d9a427446da3
-Size (mysql-5.5.12.tar.gz) = 23681636 bytes
+SHA1 (mysql-5.5.13.tar.gz) = ccfb58c87e045e6679b442c6230cac222e73f740
+RMD160 (mysql-5.5.13.tar.gz) = 5e249f533be51a8cb6d777edf630ecd82f5e68a0
+Size (mysql-5.5.13.tar.gz) = 23709591 bytes
 SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
 SHA1 (patch-CMakeLists.txt) = eaf78f2198945b5010dc3e67e13bdb37fd9c12c7
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
diff --git a/databases/mysql55-server/PLIST b/databases/mysql55-server/PLIST
index 2d22fa15c26..6726aeca400 100644
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2011/05/07 04:03:08 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/06/15 21:00:06 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -1439,6 +1439,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
@@ -1505,6 +1507,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
@@ -1575,28 +1580,6 @@ share/mysql/test/suite/binlog/t/binlog_unsafe-master.opt
 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/bug57108.result
-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/bug57108-master.opt
-share/mysql/test/suite/bugs/t/bug57108.test
-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
@@ -2951,6 +2934,8 @@ 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_bug57904.result
 share/mysql/test/suite/innodb/r/innodb_bug59307.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_bug60196.result
 share/mysql/test/suite/innodb/r/innodb_file_format.result
@@ -3045,6 +3030,8 @@ 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_bug57904.test
 share/mysql/test/suite/innodb/t/innodb_bug59307.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_bug60196-master.opt
@@ -3782,6 +3769,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_bug41902.result
 share/mysql/test/suite/rpl/r/rpl_change_master.result
@@ -4079,6 +4067,7 @@ 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-master.opt
 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_bug41902-slave.opt