Changes 5.5.22:

* InnoDB Storage Engine: A deprecation warning is now issued when
  --ignore-builtin-innodb is used.
* yaSSL was upgraded from version 1.7.2 to 2.2.0.
* Security Fix: Bug 13510739 and Bug 63775 were fixed.
* Important Change: InnoDB Storage Engine: When a row grew in size due to an
  UPDATE operation, other (non-updated) columns could be moved to off-page
  storage so that information about the row still fit within the constraints of
  the InnoDB page size. The pointer to the new allocated off-page data was not
  set up until the pages were allocated and written, potentially leading to
  lost data if the system crashed while the column was being moved out of the
  page. The problem was more common with tables using ROW_FORMAT=DYNAMIC or
  ROW_FORMAT=COMPRESSED along with the Barracuda file format, particularly with
  the innodb_file_per_table setting enabled, because page allocation operations
  are more common as the .ibd tablespace files are extended. Still, the problem
  could occur with any combination of InnoDB version, file format, and row
  format.
* InnoDB Storage Engine: An erroneous assertion could occur, in debug builds
  only, when creating an index on a column containing zero-length values (that
  is, '').
* InnoDB Storage Engine: A DDL operation such as ALTER TABLE ... ADD COLUMN
  could stall, eventually timing out with an Error 1005: Can't create table
  message referring to fil_rename_tablespace.
* InnoDB Storage Engine: A DDL operation for an InnoDB table could cause a busy
  MySQL server to halt with an assertion error:
More...

3 files changed, 15 insertions, 7 deletions

diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index 413d2afa7a1..1c892972281 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.15 2012/02/23 13:01:03 adam Exp $
+# $NetBSD: Makefile.common,v 1.16 2012/04/08 18:30:27 adam Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.21
+DISTNAME=	mysql-5.5.22
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
 
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index 1aa10108ea6..227eb415657 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2012/02/23 13:01:03 adam Exp $
+$NetBSD: distinfo,v 1.13 2012/04/08 18:30:27 adam Exp $
 
-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 (mysql-5.5.22.tar.gz) = 31d232dd72279ae69cd192a5355a8599b55944c7
+RMD160 (mysql-5.5.22.tar.gz) = 1404660a07a9eac4f6a4f25d7e8836edcaaee70e
+Size (mysql-5.5.22.tar.gz) = 24475686 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 9b91731bf61..761fc13f49b 100644
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2012/02/23 13:01:03 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2012/04/08 18:30:27 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -675,6 +675,7 @@ share/mysql/test/r/binlog_tx_isolation.result
 share/mysql/test/r/blackhole_plugin.result
 share/mysql/test/r/bool.result
 share/mysql/test/r/bootstrap.result
+share/mysql/test/r/bug13633383.result
 share/mysql/test/r/bug39022.result
 share/mysql/test/r/bug46080.result
 share/mysql/test/r/bug46261.result
@@ -2888,6 +2889,7 @@ share/mysql/test/suite/innodb/r/innodb-autoinc-44030.result
 share/mysql/test/suite/innodb/r/innodb-autoinc-56228.result
 share/mysql/test/suite/innodb/r/innodb-autoinc-optimize.result
 share/mysql/test/suite/innodb/r/innodb-autoinc.result
+share/mysql/test/suite/innodb/r/innodb-blob.result
 share/mysql/test/suite/innodb/r/innodb-consistent.result
 share/mysql/test/suite/innodb/r/innodb-create-options.result
 share/mysql/test/suite/innodb/r/innodb-index.result
@@ -2902,8 +2904,10 @@ 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_bug11754376.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_bug13510739.result
 share/mysql/test/suite/innodb/r/innodb_bug21704.result
 share/mysql/test/suite/innodb/r/innodb_bug30423.result
 share/mysql/test/suite/innodb/r/innodb_bug30919.result
@@ -2985,6 +2989,7 @@ share/mysql/test/suite/innodb/t/innodb-autoinc-56228.test
 share/mysql/test/suite/innodb/t/innodb-autoinc-master.opt
 share/mysql/test/suite/innodb/t/innodb-autoinc-optimize.test
 share/mysql/test/suite/innodb/t/innodb-autoinc.test
+share/mysql/test/suite/innodb/t/innodb-blob.test
 share/mysql/test/suite/innodb/t/innodb-consistent-master.opt
 share/mysql/test/suite/innodb/t/innodb-consistent.test
 share/mysql/test/suite/innodb/t/innodb-create-options.test
@@ -3004,9 +3009,11 @@ 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_bug11754376.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_bug13510739.test
 share/mysql/test/suite/innodb/t/innodb_bug21704.test
 share/mysql/test/suite/innodb/t/innodb_bug30423.test
 share/mysql/test/suite/innodb/t/innodb_bug30919-master.opt
@@ -5537,6 +5544,7 @@ share/mysql/test/t/blackhole_plugin.test
 share/mysql/test/t/bool.test
 share/mysql/test/t/bootstrap-master.opt
 share/mysql/test/t/bootstrap.test
+share/mysql/test/t/bug13633383.test
 share/mysql/test/t/bug39022.test
 share/mysql/test/t/bug46080-master.opt
 share/mysql/test/t/bug46080.test