Changes 5.5.21:

* A new CMake option, MYSQL_PROJECT_NAME, can be set on Windows or Mac OS X to
  be used in the project name.
Bugs Fixed
* Performance: InnoDB Storage Engine: Memory allocation for InnoDB tables was
  reorganized to reduce the memory overhead for large numbers of tables or
  partitions, avoiding situations where the “resident set size” could grow
  regardless of FLUSH TABLES statements. The problem was most evident for tables
  with large row size.
* Incompatible Change: An earlier change (in MySQL 5.1.62 and 5.5.21) was found
  to modify date-handling behavior in General Availability-status series (MySQL
  5.1 and 5.5). This change has been reverted.
* The change was that several functions became more strict when passed a DATE()
  function value as their argument, thus they rejected incomplete dates with
  a day part of zero. These functions were affected: CONVERT_TZ(), DATE_ADD(),
  DATE_SUB(), DAYOFYEAR(), LAST_DAY(), TIMESTAMPDIFF(), TO_DAYS(), TO_SECONDS(),
  WEEK(), WEEKDAY(), WEEKOFYEAR(), YEARWEEK(). The previous behavior has been
  restored.
* InnoDB Storage Engine: A Valgrind error was fixed in the function
  os_aio_init().
* InnoDB Storage Engine: The server could crash when creating an InnoDB
  temporary table under Linux, if the $TMPDIR setting points to a tmpfs
  filesystem and innodb_use_native_aio is enabled, as it is by default in MySQL
  5.5.4 and higher.
* InnoDB Storage Engine: References to C preprocessor symbols and macros
  HAVE_purify, UNIV_INIT_MEM_TO_ZERO, and UNIV_SET_MEM_TO_ZERO were removed
  from the InnoDB source code. They were only used in debug builds instrumented
  for Valgrind. They are replaced by calls to the UNIV_MEM_INVALID() macro.

3 files changed, 19 insertions, 7 deletions

diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index 8ea9d749a51..413d2afa7a1 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.14 2012/02/19 01:46:45 sbd Exp $
+# $NetBSD: Makefile.common,v 1.15 2012/02/23 13:01:03 adam Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.20
+DISTNAME=	mysql-5.5.21
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
 
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index d96d77201a8..1aa10108ea6 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2012/01/12 16:33:49 adam Exp $
+$NetBSD: distinfo,v 1.12 2012/02/23 13:01:03 adam Exp $
 
-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 (mysql-5.5.21.tar.gz) = 682e9f82566fa9dc25b0f32d979f102445a52f38
+RMD160 (mysql-5.5.21.tar.gz) = d31c1be22ac80f1c95e8f28c41ec1c82cba995cd
+Size (mysql-5.5.21.tar.gz) = 24341768 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 6ec5e672e35..9b91731bf61 100644
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2012/02/16 14:47:01 taca Exp $
+@comment $NetBSD: PLIST,v 1.13 2012/02/23 13:01:03 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -447,6 +447,7 @@ share/mysql/test/include/ipv6_clients.inc
 share/mysql/test/include/is_embedded.inc
 share/mysql/test/include/kill_query.inc
 share/mysql/test/include/kill_query_and_diff_master_slave.inc
+share/mysql/test/include/libdaemon_example.ini
 share/mysql/test/include/linux_sys_vars.inc
 share/mysql/test/include/load_sysvars.inc
 share/mysql/test/include/loaddata_autocom.inc
@@ -2901,6 +2902,7 @@ share/mysql/test/suite/innodb/r/innodb-use-sys-malloc.result
 share/mysql/test/suite/innodb/r/innodb-zip.result
 share/mysql/test/suite/innodb/r/innodb.result
 share/mysql/test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
+share/mysql/test/suite/innodb/r/innodb_bug12400341.result
 share/mysql/test/suite/innodb/r/innodb_bug12661768.result
 share/mysql/test/suite/innodb/r/innodb_bug21704.result
 share/mysql/test/suite/innodb/r/innodb_bug30423.result
@@ -3002,6 +3004,8 @@ share/mysql/test/suite/innodb/t/innodb-zip.test
 share/mysql/test/suite/innodb/t/innodb.test
 share/mysql/test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt
 share/mysql/test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
+share/mysql/test/suite/innodb/t/innodb_bug12400341-master.opt
+share/mysql/test/suite/innodb/t/innodb_bug12400341.test
 share/mysql/test/suite/innodb/t/innodb_bug12661768.test
 share/mysql/test/suite/innodb/t/innodb_bug21704.test
 share/mysql/test/suite/innodb/t/innodb_bug30423.test
@@ -4033,6 +4037,7 @@ share/mysql/test/suite/rpl/r/rpl_spec_variables.result
 share/mysql/test/suite/rpl/r/rpl_sporadic_master.result
 share/mysql/test/suite/rpl/r/rpl_ssl.result
 share/mysql/test/suite/rpl/r/rpl_ssl1.result
+share/mysql/test/suite/rpl/r/rpl_start_stop_slave.result
 share/mysql/test/suite/rpl/r/rpl_stm_000001.result
 share/mysql/test/suite/rpl/r/rpl_stm_EE_err2.result
 share/mysql/test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result
@@ -4424,6 +4429,7 @@ share/mysql/test/suite/rpl/t/rpl_sporadic_master.test
 share/mysql/test/suite/rpl/t/rpl_ssl.test
 share/mysql/test/suite/rpl/t/rpl_ssl1.test
 share/mysql/test/suite/rpl/t/rpl_start_stop_slave-slave.opt
+share/mysql/test/suite/rpl/t/rpl_start_stop_slave.test
 share/mysql/test/suite/rpl/t/rpl_stm_000001.test
 share/mysql/test/suite/rpl/t/rpl_stm_EE_err2.test
 share/mysql/test/suite/rpl/t/rpl_stm_auto_increment_bug33029.test
@@ -4654,6 +4660,7 @@ share/mysql/test/suite/sys_vars/r/innodb_autoinc_lock_mode_func.result
 share/mysql/test/suite/sys_vars/r/innodb_buffer_pool_instances_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_buffer_pool_size_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_change_buffering_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_change_buffering_debug_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_checksums_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_commit_concurrency_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_concurrency_tickets_basic.result
@@ -4705,6 +4712,7 @@ share/mysql/test/suite/sys_vars/r/innodb_table_locks_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_table_locks_func.result
 share/mysql/test/suite/sys_vars/r/innodb_thread_concurrency_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_trx_rseg_n_slots_debug_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_use_native_aio_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_use_sys_malloc_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_version_basic.result
@@ -4955,6 +4963,7 @@ share/mysql/test/suite/sys_vars/r/ssl_cert_basic.result
 share/mysql/test/suite/sys_vars/r/ssl_cipher_basic.result
 share/mysql/test/suite/sys_vars/r/ssl_key_basic.result
 share/mysql/test/suite/sys_vars/r/storage_engine_basic.result
+share/mysql/test/suite/sys_vars/r/stored_program_cache_basic.result
 share/mysql/test/suite/sys_vars/r/sync_binlog_basic.result
 share/mysql/test/suite/sys_vars/r/sync_frm_basic.result
 share/mysql/test/suite/sys_vars/r/sync_master_info_basic.result
@@ -5122,6 +5131,7 @@ share/mysql/test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test
 share/mysql/test/suite/sys_vars/t/innodb_buffer_pool_instances_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_buffer_pool_size_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_change_buffering_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_change_buffering_debug_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_checksums_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_commit_concurrency_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_concurrency_tickets_basic.test
@@ -5174,6 +5184,7 @@ share/mysql/test/suite/sys_vars/t/innodb_table_locks_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_table_locks_func.test
 share/mysql/test/suite/sys_vars/t/innodb_thread_concurrency_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_thread_sleep_delay_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_trx_rseg_n_slots_debug_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_use_native_aio_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_use_sys_malloc_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_version_basic.test
@@ -5459,6 +5470,7 @@ share/mysql/test/suite/sys_vars/t/ssl_cipher_basic.test
 share/mysql/test/suite/sys_vars/t/ssl_key_basic.test
 share/mysql/test/suite/sys_vars/t/storage_engine_basic-master.opt
 share/mysql/test/suite/sys_vars/t/storage_engine_basic.test
+share/mysql/test/suite/sys_vars/t/stored_program_cache_basic.test
 share/mysql/test/suite/sys_vars/t/sync_binlog_basic.test
 share/mysql/test/suite/sys_vars/t/sync_frm_basic.test
 share/mysql/test/suite/sys_vars/t/sync_master_info_basic.test