Changes 5.5.19:

* Performance of metadata locking operations on Windows XP systems was improved
  by instituting a cache for metadata lock objects. This permits the server to
  avoid expensive operations for creation and destruction of synchronization
  objects on XP. A new system variable, metadata_locks_cache_size, permits
  control over the size of the cache. The default size is 1024.
* Replication: Previously, replication slaves could connect to the master
  server through master accounts that use nonnative authentication, except
  Windows native authentication. This is now also true for Windows native
  authentication.

Bugs Fixed:
* InnoDB Storage Engine: An internal deadlock could occur within InnoDB, on
  a server doing a substantial amount of change buffering for DML operations,
  particularly DELETE statements.
* Rounding DBL_MAX returned DBL_MAX, not 'inf'.
* mysql_upgrade did not upgrade the system tables or create the
  mysql_upgrade_info file when run with the --write-binlog or
  --skip-write-binlog option.
* If a plugin was uninstalled, thread local variables for plugin variables of
  string type with wth PLUGIN_VAR_MEMALLOC flag were not freed.
* Deadlock could occur when these four things happened at the same time: 1) An
  old dump thread was waiting for the binary log to grow. 2) The slave server
  that replicates from the old dump thread tried to reconnect. During
  reconnection, the new dump thread tried to kill the old dump thread.
  3) A KILL statement tried to kill the old dump thread. 4) An INSERT statement
  caused a binary log rotation.

3 files changed, 20 insertions, 7 deletions

diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index caadb19ae07..2bc234cc25c 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.11 2011/11/21 16:55:59 adam Exp $
+# $NetBSD: Makefile.common,v 1.12 2011/12/13 12:14:49 adam Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.18
+DISTNAME=	mysql-5.5.19
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
 
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index 260597f3c5e..3f9e7438726 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2011/11/21 16:55:59 adam Exp $
+$NetBSD: distinfo,v 1.10 2011/12/13 12:14:49 adam Exp $
 
-SHA1 (mysql-5.5.18.tar.gz) = c85f4c082026f88f9354e47e6dc35a505cc89d18
-RMD160 (mysql-5.5.18.tar.gz) = 5a10dac0d875cf23e6990e46965f547299c0d6cb
-Size (mysql-5.5.18.tar.gz) = 24264064 bytes
+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 (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 a205820f78b..06e17f7b060 100644
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2011/11/21 16:55:59 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2011/12/13 12:14:49 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -2954,6 +2954,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_cmp_drop_table.result
 share/mysql/test/suite/innodb/r/innodb_corrupt_bit.result
 share/mysql/test/suite/innodb/r/innodb_file_format.result
 share/mysql/test/suite/innodb/r/innodb_gis.result
@@ -2967,6 +2968,7 @@ share/mysql/test/suite/innodb/r/innodb_mysql_rbk.result
 share/mysql/test/suite/innodb/r/innodb_notembedded.result
 share/mysql/test/suite/innodb/r/innodb_prefix_index_liftedlimit.result
 share/mysql/test/suite/innodb/r/innodb_prefix_index_restart_server.result
+share/mysql/test/suite/innodb/r/innodb_replace.result
 share/mysql/test/suite/innodb/r/innodb_timeout_rollback.result
 share/mysql/test/suite/innodb/r/innodb_trx_weight.result
 share/mysql/test/suite/innodb/t/disabled.def
@@ -3060,6 +3062,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_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
 share/mysql/test/suite/innodb/t/innodb_file_format-master.opt
 share/mysql/test/suite/innodb/t/innodb_file_format.test
@@ -3078,6 +3082,7 @@ share/mysql/test/suite/innodb/t/innodb_mysql_rbk.test
 share/mysql/test/suite/innodb/t/innodb_notembedded.test
 share/mysql/test/suite/innodb/t/innodb_prefix_index_liftedlimit.test
 share/mysql/test/suite/innodb/t/innodb_prefix_index_restart_server.test
+share/mysql/test/suite/innodb/t/innodb_replace.test
 share/mysql/test/suite/innodb/t/innodb_timeout_rollback-master.opt
 share/mysql/test/suite/innodb/t/innodb_timeout_rollback.test
 share/mysql/test/suite/innodb/t/innodb_trx_weight.test
@@ -3927,6 +3932,7 @@ share/mysql/test/suite/rpl/r/rpl_replicate_ignore_db.result
 share/mysql/test/suite/rpl/r/rpl_report.result
 share/mysql/test/suite/rpl/r/rpl_rewrt_db.result
 share/mysql/test/suite/rpl/r/rpl_rotate_logs.result
+share/mysql/test/suite/rpl/r/rpl_rotate_purge_deadlock.result
 share/mysql/test/suite/rpl/r/rpl_row_001.result
 share/mysql/test/suite/rpl/r/rpl_row_4_bytes.result
 share/mysql/test/suite/rpl/r/rpl_row_NOW.result
@@ -3948,6 +3954,7 @@ share/mysql/test/suite/rpl/r/rpl_row_drop.result
 share/mysql/test/suite/rpl/r/rpl_row_drop_create_temp_table.result
 share/mysql/test/suite/rpl/r/rpl_row_err_ignoredtable.result
 share/mysql/test/suite/rpl/r/rpl_row_find_row.result
+share/mysql/test/suite/rpl/r/rpl_row_find_row_debug.result
 share/mysql/test/suite/rpl/r/rpl_row_flsh_tbls.result
 share/mysql/test/suite/rpl/r/rpl_row_func001.result
 share/mysql/test/suite/rpl/r/rpl_row_func002.result
@@ -4289,6 +4296,8 @@ share/mysql/test/suite/rpl/t/rpl_rewrt_db-slave.opt
 share/mysql/test/suite/rpl/t/rpl_rewrt_db.test
 share/mysql/test/suite/rpl/t/rpl_rotate_logs.cnf
 share/mysql/test/suite/rpl/t/rpl_rotate_logs.test
+share/mysql/test/suite/rpl/t/rpl_rotate_purge_deadlock-master.opt
+share/mysql/test/suite/rpl/t/rpl_rotate_purge_deadlock.test
 share/mysql/test/suite/rpl/t/rpl_row_001.test
 share/mysql/test/suite/rpl/t/rpl_row_4_bytes-master.opt
 share/mysql/test/suite/rpl/t/rpl_row_4_bytes.test
@@ -4314,6 +4323,7 @@ share/mysql/test/suite/rpl/t/rpl_row_drop_create_temp_table.test
 share/mysql/test/suite/rpl/t/rpl_row_err_daisychain-master.opt
 share/mysql/test/suite/rpl/t/rpl_row_err_daisychain-slave.opt
 share/mysql/test/suite/rpl/t/rpl_row_find_row.test
+share/mysql/test/suite/rpl/t/rpl_row_find_row_debug.test
 share/mysql/test/suite/rpl/t/rpl_row_flsh_tbls.test
 share/mysql/test/suite/rpl/t/rpl_row_func001.test
 share/mysql/test/suite/rpl/t/rpl_row_func002.test
@@ -4771,6 +4781,7 @@ share/mysql/test/suite/sys_vars/r/max_user_connections_func.result
 share/mysql/test/suite/sys_vars/r/max_write_lock_count_basic_32.result
 share/mysql/test/suite/sys_vars/r/max_write_lock_count_basic_64.result
 share/mysql/test/suite/sys_vars/r/maximum_basic.result
+share/mysql/test/suite/sys_vars/r/metadata_locks_cache_size_basic.result
 share/mysql/test/suite/sys_vars/r/min_examined_row_limit_basic_32.result
 share/mysql/test/suite/sys_vars/r/min_examined_row_limit_basic_64.result
 share/mysql/test/suite/sys_vars/r/multi_range_count_basic_32.result
@@ -5242,6 +5253,8 @@ share/mysql/test/suite/sys_vars/t/max_write_lock_count_basic_32.test
 share/mysql/test/suite/sys_vars/t/max_write_lock_count_basic_64.test
 share/mysql/test/suite/sys_vars/t/maximum_basic-master.opt
 share/mysql/test/suite/sys_vars/t/maximum_basic.test
+share/mysql/test/suite/sys_vars/t/metadata_locks_cache_size_basic-master.opt
+share/mysql/test/suite/sys_vars/t/metadata_locks_cache_size_basic.test
 share/mysql/test/suite/sys_vars/t/min_examined_row_limit_basic_32.test
 share/mysql/test/suite/sys_vars/t/min_examined_row_limit_basic_64.test
 share/mysql/test/suite/sys_vars/t/multi_range_count_basic_32.test