Changes 5.5.20:

* A new server option, --slow-start-timeout, controls the Windows service
  control manager's service start timeout. The value is the maximum number of
  milliseconds that the service control manager waits before trying to kill the
  MySQL service during startup. The default value is 15000 (15 seconds). If the
  MySQL service takes too long to start, you may need to increase this value.
  A value of 0 means there is no timeout.

Bugs Fixed:
* Important Change: Replication: Setting an empty user in a CHANGE MASTER TO
  statement caused an invalid internal result and is no longer permitted. Trying  to use MASTER_USER='' or setting MASTER_PASSWORD while leaving MASTER_USER
  unset causes the statement to fail with an error.
* Important Change: Replication: Moving the binary log file, relay log file, or
  both files to a new location, then restarting the server with a new value for
  --log-bin, --relay-log, or both, caused the server to abort on start. This
  was because the entries in the index file overrode the new location. In
  addition, paths were calculated relative to datadir (rather than to the
  --log-bin or --relay-log values).
* InnoDB Storage Engine: When doing a live downgrade from MySQL 5.6.4 or later,   with innodb_page_size set to a value other than 16384, now the earlier MySQL
  version reports that the page size is incompatible with the older version,
  rather than crashing or displaying a “corruption” error.
* InnoDB Storage Engine: Issuing INSERT...ON DUPLICATE KEY statements for
  InnoDB tables from concurrent threads could cause a deadlock, particularly
  with the INSERT...ON DUPLICATE KEY UPDATE form. The fix avoids deadlocks
  caused by the same row being accessed by more than one transaction. Deadlocks
  could still occur when multiple rows are inserted and updated simultaneously
  by different transactions in inconsistent order; those types of deadlocks
  require the standard error handling on the application side, of re-trying the
  transaction.
* An incorrect InnoDB assertion could cause the server to halt. This issue only
  affected debug builds. The assertion referenced the source file btr0pcur.ic
  and the variable cursor->pos_state.
* Locale information for FORMAT() function instances was lost in view
  definitions.
* The handle_segfault() signal-handler code in mysqld could itself crash due to
  calling unsafe functions.
* Enabling myisam_use_mmap could cause the server to crash.
* Concurrent access to ARCHIVE tables could cause corruption.

3 files changed, 15 insertions, 7 deletions

diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index 2bc234cc25c..6ca48acf099 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.12 2011/12/13 12:14:49 adam Exp $
+# $NetBSD: Makefile.common,v 1.13 2012/01/12 16:33:49 adam Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.19
+DISTNAME=	mysql-5.5.20
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
 
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index 3f9e7438726..d96d77201a8 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2011/12/13 12:14:49 adam Exp $
+$NetBSD: distinfo,v 1.11 2012/01/12 16:33:49 adam Exp $
 
-SHA1 (mysql-5.5.19.tar.gz) = f6a3b5fb5a10f8110fd85463e1a25fb314e60c24
-RMD160 (mysql-5.5.19.tar.gz) = cae5bbea6d527ffb899eeeced8fc411375c285ae
-Size (mysql-5.5.19.tar.gz) = 24296942 bytes
+SHA1 (mysql-5.5.20.tar.gz) = d5066327c41ac5a338ca0bb748e50bc4e1902442
+RMD160 (mysql-5.5.20.tar.gz) = 2bdecbe6f61497f3d8c9255610d713f6f4e1164b
+Size (mysql-5.5.20.tar.gz) = 24305842 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 06e17f7b060..fed6cb091bb 100644
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2011/12/13 12:14:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2012/01/12 16:33:49 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -504,6 +504,7 @@ share/mysql/test/include/ps_renew.inc
 share/mysql/test/include/query_cache.inc
 share/mysql/test/include/query_cache_sql_prepare.inc
 share/mysql/test/include/read_many_rows.inc
+share/mysql/test/include/relocate_binlogs.inc
 share/mysql/test/include/report-features.test
 share/mysql/test/include/restart_mysqld.inc
 share/mysql/test/include/restart_slave_sql.inc
@@ -2954,6 +2955,7 @@ share/mysql/test/suite/innodb/r/innodb_bug59641.result
 share/mysql/test/suite/innodb/r/innodb_bug59733.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_bug60229.result
 share/mysql/test/suite/innodb/r/innodb_cmp_drop_table.result
 share/mysql/test/suite/innodb/r/innodb_corrupt_bit.result
 share/mysql/test/suite/innodb/r/innodb_file_format.result
@@ -3062,6 +3064,8 @@ 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
 share/mysql/test/suite/innodb/t/innodb_bug60196.test
+share/mysql/test/suite/innodb/t/innodb_bug60229-master.opt
+share/mysql/test/suite/innodb/t/innodb_bug60229.test
 share/mysql/test/suite/innodb/t/innodb_cmp_drop_table-master.opt
 share/mysql/test/suite/innodb/t/innodb_cmp_drop_table.test
 share/mysql/test/suite/innodb/t/innodb_corrupt_bit.test
@@ -3799,6 +3803,7 @@ share/mysql/test/suite/rpl/r/rpl_begin_commit_rollback.result
 share/mysql/test/suite/rpl/r/rpl_binlog_corruption.result
 share/mysql/test/suite/rpl/r/rpl_binlog_errors.result
 share/mysql/test/suite/rpl/r/rpl_binlog_grant.result
+share/mysql/test/suite/rpl/r/rpl_binlog_index.result
 share/mysql/test/suite/rpl/r/rpl_bit.result
 share/mysql/test/suite/rpl/r/rpl_bit_npk.result
 share/mysql/test/suite/rpl/r/rpl_blackhole.result
@@ -3817,6 +3822,7 @@ share/mysql/test/suite/rpl/r/rpl_colSize.result
 share/mysql/test/suite/rpl/r/rpl_commit_after_flush.result
 share/mysql/test/suite/rpl/r/rpl_concurrency_error.result
 share/mysql/test/suite/rpl/r/rpl_conditional_comments.result
+share/mysql/test/suite/rpl/r/rpl_connection.result
 share/mysql/test/suite/rpl/r/rpl_create_database.result
 share/mysql/test/suite/rpl/r/rpl_create_if_not_exists.result
 share/mysql/test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result
@@ -4098,6 +4104,7 @@ share/mysql/test/suite/rpl/t/rpl_binlog_corruption.test
 share/mysql/test/suite/rpl/t/rpl_binlog_errors-master.opt
 share/mysql/test/suite/rpl/t/rpl_binlog_errors.test
 share/mysql/test/suite/rpl/t/rpl_binlog_grant.test
+share/mysql/test/suite/rpl/t/rpl_binlog_index.test
 share/mysql/test/suite/rpl/t/rpl_bit.test
 share/mysql/test/suite/rpl/t/rpl_bit_npk.test
 share/mysql/test/suite/rpl/t/rpl_blackhole.test
@@ -4121,6 +4128,7 @@ share/mysql/test/suite/rpl/t/rpl_commit_after_flush.test
 share/mysql/test/suite/rpl/t/rpl_concurrency_error-master.opt
 share/mysql/test/suite/rpl/t/rpl_concurrency_error.test
 share/mysql/test/suite/rpl/t/rpl_conditional_comments.test
+share/mysql/test/suite/rpl/t/rpl_connection.test
 share/mysql/test/suite/rpl/t/rpl_create_database-master.opt
 share/mysql/test/suite/rpl/t/rpl_create_database-slave.opt
 share/mysql/test/suite/rpl/t/rpl_create_database.test