Changes 5.5.18:

Functionality Added or Changed
* Upgrading from an Advanced GPL RPM package to an Advanced RPM package did not
  work. Now on Linux it is possible to use rpm -U to replace any installed
  MySQL product by any other of the same release family. It is not necessary to
  remove the old produce with rpm -e first.

Bugs Fixed
* Incompatible Change: Replication.
* During the table-opening process, memory was allocated and later freed that
  was needed view loading, even for statements that did not use views. These
  unnecessary allocation and free operations are no longer done.
* mysql_plugin mishandled the --plugin-ini, --mysqld, and --my-print-defaults
  options under some circumstances.
* mysql_plugin returned the wrong error code from failed server bootstrap
  execution.
* Several improvements were made to the libedit library bundled with MySQL
  distributions, and that is available for all platforms that MySQL supports
  except Windows.
* ARCHIVE tables with NULL columns could cause server crashes or become corrupt
  under concurrent load.
* OPTIMIZE TABLE could corrupt MyISAM tables if myisam_use_mmap was enabled.
* A query that selected a GROUP_CONCAT() function result could return different
  values depending on whether an ORDER BY of the function result was present.
* For FEDERATED tables, loss of connection to the remote table during some
  insert operations could cause a server crash.

3 files changed, 18 insertions, 12 deletions

diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index 7c6b7f58528..caadb19ae07 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.10 2011/10/22 10:32:37 adam Exp $
+# $NetBSD: Makefile.common,v 1.11 2011/11/21 16:55:59 adam Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.17
+DISTNAME=	mysql-5.5.18
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
 
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index 14a5da06eb0..260597f3c5e 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2011/10/22 10:32:37 adam Exp $
+$NetBSD: distinfo,v 1.9 2011/11/21 16:55:59 adam Exp $
 
-SHA1 (mysql-5.5.17.tar.gz) = de32ea3c3bb1b9cce49230425c27e12a78f80533
-RMD160 (mysql-5.5.17.tar.gz) = 6bf00da1df03e869e3cc6c18cd03d5634838688e
-Size (mysql-5.5.17.tar.gz) = 24213337 bytes
+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 (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 4bcbb7295a5..a205820f78b 100644
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2011/10/22 10:32:37 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2011/11/21 16:55:59 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -240,7 +240,6 @@ share/mysql/test/extra/rpl_tests/rpl_get_master_version_and_clock.test
 share/mysql/test/extra/rpl_tests/rpl_implicit_commit_binlog.test
 share/mysql/test/extra/rpl_tests/rpl_innodb.test
 share/mysql/test/extra/rpl_tests/rpl_insert_delayed.test
-share/mysql/test/extra/rpl_tests/rpl_insert_duplicate.test
 share/mysql/test/extra/rpl_tests/rpl_insert_id.test
 share/mysql/test/extra/rpl_tests/rpl_insert_id_pk.test
 share/mysql/test/extra/rpl_tests/rpl_insert_ignore.test
@@ -1305,6 +1304,7 @@ share/mysql/test/std_data/Moscow_leap
 share/mysql/test/std_data/bad_gis_data.dat
 share/mysql/test/std_data/binlog_savepoint.000001
 share/mysql/test/std_data/binlog_transaction.000001
+share/mysql/test/std_data/bug11747416_32228_binlog.000001
 share/mysql/test/std_data/bug15328.cnf
 share/mysql/test/std_data/bug16266.000001
 share/mysql/test/std_data/bug19371.MYD
@@ -2900,6 +2900,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_bug12661768.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
@@ -2959,6 +2960,7 @@ share/mysql/test/suite/innodb/r/innodb_gis.result
 share/mysql/test/suite/innodb/r/innodb_index_large_prefix.result
 share/mysql/test/suite/innodb/r/innodb_information_schema.result
 share/mysql/test/suite/innodb/r/innodb_lock_wait_timeout_1.result
+share/mysql/test/suite/innodb/r/innodb_misc1.result
 share/mysql/test/suite/innodb/r/innodb_multi_update.result
 share/mysql/test/suite/innodb/r/innodb_mysql.result
 share/mysql/test/suite/innodb/r/innodb_mysql_rbk.result
@@ -2996,6 +2998,7 @@ 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_bug12661768.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
@@ -3021,6 +3024,7 @@ share/mysql/test/suite/innodb/t/innodb_bug44571.test
 share/mysql/test/suite/innodb/t/innodb_bug45357.test
 share/mysql/test/suite/innodb/t/innodb_bug46000.test
 share/mysql/test/suite/innodb/t/innodb_bug46676.test
+share/mysql/test/suite/innodb/t/innodb_bug47167-master.opt
 share/mysql/test/suite/innodb/t/innodb_bug47167.test
 share/mysql/test/suite/innodb/t/innodb_bug47621.test
 share/mysql/test/suite/innodb/t/innodb_bug47622.test
@@ -3057,12 +3061,15 @@ 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_corrupt_bit.test
+share/mysql/test/suite/innodb/t/innodb_file_format-master.opt
 share/mysql/test/suite/innodb/t/innodb_file_format.test
 share/mysql/test/suite/innodb/t/innodb_gis.test
 share/mysql/test/suite/innodb/t/innodb_index_large_prefix.test
 share/mysql/test/suite/innodb/t/innodb_information_schema.test
 share/mysql/test/suite/innodb/t/innodb_lock_wait_timeout_1-master.opt
 share/mysql/test/suite/innodb/t/innodb_lock_wait_timeout_1.test
+share/mysql/test/suite/innodb/t/innodb_misc1-master.opt
+share/mysql/test/suite/innodb/t/innodb_misc1.test
 share/mysql/test/suite/innodb/t/innodb_multi_update.test
 share/mysql/test/suite/innodb/t/innodb_mysql-master.opt
 share/mysql/test/suite/innodb/t/innodb_mysql.test
@@ -3796,6 +3803,7 @@ 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_cant_read_event_incident.result
 share/mysql/test/suite/rpl/r/rpl_change_master.result
 share/mysql/test/suite/rpl/r/rpl_charset.result
 share/mysql/test/suite/rpl/r/rpl_charset_sjis.result
@@ -3854,11 +3862,9 @@ share/mysql/test/suite/rpl/r/rpl_innodb_bug30888.result
 share/mysql/test/suite/rpl/r/rpl_innodb_mixed_ddl.result
 share/mysql/test/suite/rpl/r/rpl_innodb_mixed_dml.result
 share/mysql/test/suite/rpl/r/rpl_insert.result
-share/mysql/test/suite/rpl/r/rpl_insert_duplicate.result
 share/mysql/test/suite/rpl/r/rpl_insert_id.result
 share/mysql/test/suite/rpl/r/rpl_insert_id_pk.result
 share/mysql/test/suite/rpl/r/rpl_insert_ignore.result
-share/mysql/test/suite/rpl/r/rpl_insert_select.result
 share/mysql/test/suite/rpl/r/rpl_invoked_features.result
 share/mysql/test/suite/rpl/r/rpl_ip_mix.result
 share/mysql/test/suite/rpl/r/rpl_ip_mix2.result
@@ -4097,6 +4103,7 @@ 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
 share/mysql/test/suite/rpl/t/rpl_bug41902.test
+share/mysql/test/suite/rpl/t/rpl_cant_read_event_incident.test
 share/mysql/test/suite/rpl/t/rpl_change_master.test
 share/mysql/test/suite/rpl/t/rpl_charset.test
 share/mysql/test/suite/rpl/t/rpl_charset_sjis.test
@@ -4183,11 +4190,9 @@ share/mysql/test/suite/rpl/t/rpl_innodb_bug30888.test
 share/mysql/test/suite/rpl/t/rpl_innodb_mixed_ddl.test
 share/mysql/test/suite/rpl/t/rpl_innodb_mixed_dml.test
 share/mysql/test/suite/rpl/t/rpl_insert.test
-share/mysql/test/suite/rpl/t/rpl_insert_duplicate.test
 share/mysql/test/suite/rpl/t/rpl_insert_id.test
 share/mysql/test/suite/rpl/t/rpl_insert_id_pk.test
 share/mysql/test/suite/rpl/t/rpl_insert_ignore.test
-share/mysql/test/suite/rpl/t/rpl_insert_select.test
 share/mysql/test/suite/rpl/t/rpl_invoked_features-master.opt
 share/mysql/test/suite/rpl/t/rpl_invoked_features.test
 share/mysql/test/suite/rpl/t/rpl_ip_mix-master.opt
@@ -5107,6 +5112,7 @@ share/mysql/test/suite/sys_vars/t/innodb_doublewrite_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_fast_shutdown_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_file_format_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_file_format_check_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_file_format_max_basic-master.opt
 share/mysql/test/suite/sys_vars/t/innodb_file_format_max_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_file_io_threads_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_file_per_table_basic.test