Changes 5.5.14:

* CMake configuration support on Linux now provides a boolean ENABLE_GCOV
  option to control whether to include support for gcov.
* InnoDB now permits concurrent reads while creating a secondary index.
* Client programs now display more information for SSL errors to aid in
  diagnosis and debugging of connection problems.
* In the audit plugin interface, the event_class member was removed from the
  mysql_event_general structure and the calling sequence for the notification
  function changed. Originally, the second argument was a pointer to the event
  structure. The function now receives this information as two arguments: an
  event class number and a pointer to the event. Corresponding to these
  changes, MYSQL_AUDIT_INTERFACE_VERSION was increased to 0x0300.
* The plugin_audit.h header file, and the NULL_AUDIT example plugin in the
  plugin/audit_null directory have been modified per these changes. See
  Section 21.2.4.7, “Writing Audit Plugins”.
* Bug fixes.

9 files changed, 58 insertions, 30 deletions

diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index 00d88828b02..cb54280ac1d 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.6 2011/06/15 21:00:05 adam Exp $
+# $NetBSD: Makefile.common,v 1.7 2011/07/08 09:32:07 adam Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.13
+DISTNAME=	mysql-5.5.14
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
 
diff --git a/databases/mysql55-client/PLIST b/databases/mysql55-client/PLIST
index a5023072b95..a6aa6908fa2 100644
--- a/databases/mysql55-client/PLIST
+++ b/databases/mysql55-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2011/07/08 09:32:07 adam Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_client_test
@@ -62,6 +62,7 @@ include/mysql/mysql/service_thd_alloc.h
 include/mysql/mysql/service_thd_wait.h
 include/mysql/mysql/service_thread_scheduler.h
 include/mysql/mysql/services.h
+include/mysql/mysql/thread_pool_priv.h
 include/mysql/mysql_com.h
 include/mysql/mysql_embed.h
 include/mysql/mysql_time.h
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index 3a791f3fa0c..e910412fcd9 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2011/06/15 21:00:05 adam Exp $
+$NetBSD: distinfo,v 1.4 2011/07/08 09:32:07 adam Exp $
 
-SHA1 (mysql-5.5.13.tar.gz) = ccfb58c87e045e6679b442c6230cac222e73f740
-RMD160 (mysql-5.5.13.tar.gz) = 5e249f533be51a8cb6d777edf630ecd82f5e68a0
-Size (mysql-5.5.13.tar.gz) = 23709591 bytes
+SHA1 (mysql-5.5.14.tar.gz) = 3b17e20be4e8bcc0f94392fb444f4a09f80de2e4
+RMD160 (mysql-5.5.14.tar.gz) = 1c84fc3967691e9eedd1b90df780a9d738a709c4
+Size (mysql-5.5.14.tar.gz) = 23772997 bytes
 SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
-SHA1 (patch-CMakeLists.txt) = eaf78f2198945b5010dc3e67e13bdb37fd9c12c7
+SHA1 (patch-CMakeLists.txt) = 5e990e40e1e8a5d558315a38b6596c8fa4227e7b
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysqladmin.cc) = 901c2b675cff7589ab629e591dabf26d17e4d8a7
 SHA1 (patch-client_mysqlbinlog.cc) = f78dd6538b978e1ae95bb720e8baa91087ecc149
@@ -14,7 +14,7 @@ SHA1 (patch-include_CMakeLists.txt) = 4781c69315624fb5567ae70cee87f1ddb3f89847
 SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5
 SHA1 (patch-include_my_net.h) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af
 SHA1 (patch-include_my_pthread.h) = 109d376b4cf5b64c5243f9e91300667441131f86
-SHA1 (patch-include_myisam.h) = cfbec9eee43282c5ebc38a64add97218c74279a0
+SHA1 (patch-include_myisam.h) = 475070d41b06c04c6ae692743fc1b0244afe0a88
 SHA1 (patch-mysql-test_CMakeLists.txt) = d089a79df443ab2d8f97e7a1334aee2098dbb892
 SHA1 (patch-mysys_stacktrace.c) = c7633ab86f02e345e95564536882e09a9ef19f8d
 SHA1 (patch-scripts_CMakeLists.txt) = 17ec1d8d5f0c9e453c64f2b59e757e645a3a1a59
@@ -22,8 +22,8 @@ SHA1 (patch-scripts_mysqld_safe.sh) = 74879fe38b74e3a51db1dd1233b29a05e9edad28
 SHA1 (patch-sql_CMakeLists.txt) = 9ad00a281976d5e96a95e17ba7387a8835b43e55
 SHA1 (patch-sql_log_event.cc) = e8d0dd7dc876b0e386be138cd5f569b4af8eca8a
 SHA1 (patch-sql_log_event.h) = eb9e38bbf50914ee504501b0723b57f80849ef48
-SHA1 (patch-sql_mysqld.cc) = 19d96c430e126994c27e7f2eb507793f6b9ce094
+SHA1 (patch-sql_mysqld.cc) = b5ce7c3fb2dffa72df816ec2c34d26eb10dbcb09
 SHA1 (patch-sql_sql_string.cc) = 00368733072803d59473410badb82e92673de0a7
-SHA1 (patch-storage_innobase_include_os0sync.h) = 5c3548113f8e52375e036e37885ae9c797daf3d4
+SHA1 (patch-storage_innobase_include_os0sync.h) = d3f66b063af3328f3ee518dd00dfc9d1d25943dc
 SHA1 (patch-storage_ndb_include_util_Parser.hpp) = ca9406a8b01dffb3f515f132fa7aaef66c78f2be
 SHA1 (patch-strings_decimal.c) = 4d2a3d8acb3b0af56180f3a1faa8735d692be5b9
diff --git a/databases/mysql55-client/patches/patch-CMakeLists.txt b/databases/mysql55-client/patches/patch-CMakeLists.txt
index f425bf8ed7c..54089387ee0 100644
--- a/databases/mysql55-client/patches/patch-CMakeLists.txt
+++ b/databases/mysql55-client/patches/patch-CMakeLists.txt
@@ -1,10 +1,10 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2011/07/08 09:32:07 adam Exp $
 
 Split configuration between mysql-client and mysql-server.
 
 --- CMakeLists.txt.orig	2011-03-31 13:36:18.000000000 +0000
 +++ CMakeLists.txt
-@@ -274,7 +274,6 @@ ADD_SUBDIRECTORY(strings)
+@@ -281,7 +281,6 @@ ADD_SUBDIRECTORY(strings)
  ADD_SUBDIRECTORY(vio)
  ADD_SUBDIRECTORY(regex)
  ADD_SUBDIRECTORY(mysys)
@@ -12,7 +12,7 @@ Split configuration between mysql-client and mysql-server.
  
  
  IF(WITH_UNIT_TESTS)
-@@ -286,9 +285,13 @@ IF(WITH_UNIT_TESTS)
+@@ -293,9 +292,13 @@ IF(WITH_UNIT_TESTS)
  ENDIF()
  
  ADD_SUBDIRECTORY(extra)
@@ -28,7 +28,7 @@ Split configuration between mysql-client and mysql-server.
    ADD_SUBDIRECTORY(sql)
    ADD_SUBDIRECTORY(sql/share)
    ADD_SUBDIRECTORY(libservices)
-@@ -301,11 +304,7 @@ IF(NOT WITHOUT_SERVER)
+@@ -308,11 +311,7 @@ IF(NOT WITHOUT_SERVER)
    ADD_SUBDIRECTORY(mysql-test)
    ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
    ADD_SUBDIRECTORY(support-files)
diff --git a/databases/mysql55-client/patches/patch-include_myisam.h b/databases/mysql55-client/patches/patch-include_myisam.h
index 5e6dd48a6bf..689fdcc32e1 100644
--- a/databases/mysql55-client/patches/patch-include_myisam.h
+++ b/databases/mysql55-client/patches/patch-include_myisam.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-include_myisam.h,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $
+$NetBSD: patch-include_myisam.h,v 1.2 2011/07/08 09:32:07 adam Exp $
 
 Adjust MI_MAX_KEY_LENGTH x4.
 
 --- include/myisam.h.orig	2010-02-04 11:37:06.000000000 +0000
 +++ include/myisam.h
-@@ -48,7 +48,7 @@ extern "C" {
+@@ -49,7 +49,7 @@ extern "C" {
    The following defines can be increased if necessary.
    But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
  */
diff --git a/databases/mysql55-client/patches/patch-sql_mysqld.cc b/databases/mysql55-client/patches/patch-sql_mysqld.cc
index 6d3c2b69fb4..91fd944ed77 100644
--- a/databases/mysql55-client/patches/patch-sql_mysqld.cc
+++ b/databases/mysql55-client/patches/patch-sql_mysqld.cc
@@ -1,15 +1,22 @@
-$NetBSD: patch-sql_mysqld.cc,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $
+$NetBSD: patch-sql_mysqld.cc,v 1.2 2011/07/08 09:32:07 adam Exp $
 
-* Handle DragonFly as the same as FreeBSD.
-
---- sql/mysqld.cc.orig	2010-02-04 11:39:50.000000000 +0000
+--- sql/mysqld.cc.orig	2011-06-21 16:42:40.000000000 +0000
 +++ sql/mysqld.cc
-@@ -163,7 +163,7 @@ static void getvolumeID(BYTE *volumeName
+@@ -163,7 +163,7 @@ extern int memcntl(caddr_t, size_t, int,
  int initgroups(const char *,unsigned int);
  #endif
  
--#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H)
-+#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(HAVE_IEEEFP_H)
+-#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT)
++#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT)
  #include <ieeefp.h>
  #ifdef HAVE_FP_EXCEPT				// Fix type conflict
  typedef fp_except fp_except_t;
+@@ -194,7 +194,7 @@ extern "C" my_bool reopen_fstreams(const
+ 
+ inline void setup_fpu()
+ {
+-#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT)
++#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT)
+   /* We can't handle floating point exceptions with threads, so disable
+      this on freebsd
+      Don't fall for overflow, underflow,divide-by-zero or loss of precision.
diff --git a/databases/mysql55-client/patches/patch-storage_innobase_include_os0sync.h b/databases/mysql55-client/patches/patch-storage_innobase_include_os0sync.h
index afc41b0a07d..e0778eeb24b 100644
--- a/databases/mysql55-client/patches/patch-storage_innobase_include_os0sync.h
+++ b/databases/mysql55-client/patches/patch-storage_innobase_include_os0sync.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-storage_innobase_include_os0sync.h,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $
+$NetBSD: patch-storage_innobase_include_os0sync.h,v 1.2 2011/07/08 09:32:07 adam Exp $
 
 --- storage/innobase/include/os0sync.h.orig	2011-03-31 13:36:18.000000000 +0000
 +++ storage/innobase/include/os0sync.h
-@@ -330,7 +330,7 @@ compare to, new_val is the value to swap
+@@ -327,7 +327,7 @@ compare to, new_val is the value to swap
  	(atomic_cas_ulong(ptr, old_val, new_val) == old_val)
  
  # define os_compare_and_swap_lint(ptr, old_val, new_val) \
@@ -11,7 +11,7 @@ $NetBSD: patch-storage_innobase_include_os0sync.h,v 1.1.1.1 2011/04/25 21:12:53
  
  # ifdef HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS
  #  if SIZEOF_PTHREAD_T == 4
-@@ -355,7 +355,7 @@ Returns the resulting value, ptr is poin
+@@ -352,7 +352,7 @@ Returns the resulting value, ptr is poin
  amount of increment. */
  
  # define os_atomic_increment_lint(ptr, amount) \
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 76d4dfa1700..99822999c99 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/06 16:21:16 abs Exp $
+# $NetBSD: Makefile,v 1.3 2011/07/08 09:32:07 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
 SVR4_PKGNAME=	mysqs
@@ -31,7 +31,7 @@ PLIST.embedded=		yes
 PLIST_VARS+=		embedded ndb auth_socket
 
 .if ${OPSYS} == "Linux"
-PLIST.auth_socket=            yes
+PLIST.auth_socket=	yes
 .endif
 
 PTHREAD_OPTS+=		require
diff --git a/databases/mysql55-server/PLIST b/databases/mysql55-server/PLIST
index 6726aeca400..94a5dc644f6 100644
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2011/06/15 21:00:06 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/07/08 09:32:07 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -482,6 +482,7 @@ share/mysql/test/include/not_ndb.inc
 share/mysql/test/include/not_ndb_default.inc
 share/mysql/test/include/not_openssl.inc
 share/mysql/test/include/not_parallel.inc
+share/mysql/test/include/not_threadpool.inc
 share/mysql/test/include/not_valgrind.inc
 share/mysql/test/include/not_var_link.inc
 share/mysql/test/include/not_windows.inc
@@ -620,6 +621,7 @@ share/mysql/test/lib/mtr_match.pm
 share/mysql/test/lib/mtr_misc.pl
 share/mysql/test/lib/mtr_process.pl
 share/mysql/test/lib/mtr_report.pm
+share/mysql/test/lib/mtr_results.pm
 share/mysql/test/lib/mtr_stress.pl
 share/mysql/test/lib/mtr_unique.pm
 share/mysql/test/lib/v1/My/Config.pm
@@ -654,6 +656,7 @@ share/mysql/test/r/ansi.result
 share/mysql/test/r/archive-big.result
 share/mysql/test/r/archive.result
 share/mysql/test/r/archive_bitfield.result
+share/mysql/test/r/archive_debug.result
 share/mysql/test/r/archive_gis.result
 share/mysql/test/r/archive_plugin.result
 share/mysql/test/r/auto_increment.result
@@ -907,6 +910,7 @@ share/mysql/test/r/heap_auto_increment.result
 share/mysql/test/r/heap_btree.result
 share/mysql/test/r/heap_hash.result
 share/mysql/test/r/help.result
+share/mysql/test/r/implicit_char_to_num_conversion.result
 share/mysql/test/r/implicit_commit.result
 share/mysql/test/r/index_merge_innodb.result
 share/mysql/test/r/index_merge_myisam.result
@@ -1156,6 +1160,7 @@ share/mysql/test/r/rpl_extraColmaster_innodb.result
 share/mysql/test/r/rpl_extraColmaster_myisam.result
 share/mysql/test/r/rpl_mysqldump_slave.result
 share/mysql/test/r/schema.result
+share/mysql/test/r/secure_file_priv_win.result
 share/mysql/test/r/select.result
 share/mysql/test/r/select_found.result
 share/mysql/test/r/select_safe.result
@@ -1207,6 +1212,7 @@ share/mysql/test/r/ssl_compress.result
 share/mysql/test/r/ssl_connect.result
 share/mysql/test/r/status.result
 share/mysql/test/r/status2.result
+share/mysql/test/r/status_bug17954.result
 share/mysql/test/r/strict.result
 share/mysql/test/r/strict_autoinc_1myisam.result
 share/mysql/test/r/strict_autoinc_2innodb.result
@@ -1459,6 +1465,7 @@ share/mysql/test/suite/binlog/r/binlog_mixed_load_data.result
 share/mysql/test/suite/binlog/r/binlog_multi_engine.result
 share/mysql/test/suite/binlog/r/binlog_old_versions.result
 share/mysql/test/suite/binlog/r/binlog_query_filter_rules.result
+share/mysql/test/suite/binlog/r/binlog_reset_master.result
 share/mysql/test/suite/binlog/r/binlog_row_binlog.result
 share/mysql/test/suite/binlog/r/binlog_row_cache_stat.result
 share/mysql/test/suite/binlog/r/binlog_row_ctype_cp932.result
@@ -1532,6 +1539,7 @@ share/mysql/test/suite/binlog/t/binlog_multi_engine.test
 share/mysql/test/suite/binlog/t/binlog_old_versions.test
 share/mysql/test/suite/binlog/t/binlog_query_filter_rules-master.opt
 share/mysql/test/suite/binlog/t/binlog_query_filter_rules.test
+share/mysql/test/suite/binlog/t/binlog_reset_master.test
 share/mysql/test/suite/binlog/t/binlog_row_binlog-master.opt
 share/mysql/test/suite/binlog/t/binlog_row_binlog.test
 share/mysql/test/suite/binlog/t/binlog_row_cache_stat.test
@@ -2940,12 +2948,15 @@ 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_file_format.result
 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_multi_update.result
 share/mysql/test/suite/innodb/r/innodb_mysql.result
 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_timeout_rollback.result
 share/mysql/test/suite/innodb/r/innodb_trx_weight.result
 share/mysql/test/suite/innodb/t/disabled.def
@@ -3038,6 +3049,7 @@ 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_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
@@ -3047,6 +3059,8 @@ share/mysql/test/suite/innodb/t/innodb_mysql.test
 share/mysql/test/suite/innodb/t/innodb_mysql_rbk-master.opt
 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_timeout_rollback-master.opt
 share/mysql/test/suite/innodb/t/innodb_timeout_rollback.test
 share/mysql/test/suite/innodb/t/innodb_trx_weight.test
@@ -4422,6 +4436,7 @@ share/mysql/test/suite/rpl/t/rpl_trigger.test
 share/mysql/test/suite/rpl/t/rpl_trunc_temp.test
 share/mysql/test/suite/rpl/t/rpl_truncate_2myisam.test
 share/mysql/test/suite/rpl/t/rpl_truncate_3innodb.test
+share/mysql/test/suite/rpl/t/rpl_typeconv-master.opt
 share/mysql/test/suite/rpl/t/rpl_typeconv-slave.opt
 share/mysql/test/suite/rpl/t/rpl_typeconv.test
 share/mysql/test/suite/rpl/t/rpl_typeconv_innodb.test
@@ -5440,6 +5455,7 @@ share/mysql/test/t/ansi.test
 share/mysql/test/t/archive-big.test
 share/mysql/test/t/archive.test
 share/mysql/test/t/archive_bitfield.test
+share/mysql/test/t/archive_debug.test
 share/mysql/test/t/archive_gis.test
 share/mysql/test/t/archive_plugin-master.opt
 share/mysql/test/t/archive_plugin.test
@@ -5673,6 +5689,7 @@ share/mysql/test/t/heap_auto_increment.test
 share/mysql/test/t/heap_btree.test
 share/mysql/test/t/heap_hash.test
 share/mysql/test/t/help.test
+share/mysql/test/t/implicit_char_to_num_conversion.test
 share/mysql/test/t/implicit_commit-master.opt
 share/mysql/test/t/implicit_commit.test
 share/mysql/test/t/index_merge_innodb.test
@@ -5973,6 +5990,8 @@ share/mysql/test/t/row.test
 share/mysql/test/t/rowid_order_innodb.test
 share/mysql/test/t/rpl_mysqldump_slave.test
 share/mysql/test/t/schema.test
+share/mysql/test/t/secure_file_priv_win-master.opt
+share/mysql/test/t/secure_file_priv_win.test
 share/mysql/test/t/select.test
 share/mysql/test/t/select_found.test
 share/mysql/test/t/select_safe.test
@@ -6028,6 +6047,7 @@ share/mysql/test/t/ssl_connect.test
 share/mysql/test/t/status-master.opt
 share/mysql/test/t/status.test
 share/mysql/test/t/status2.test
+share/mysql/test/t/status_bug17954.test
 share/mysql/test/t/strict-master.opt
 share/mysql/test/t/strict.test
 share/mysql/test/t/strict_autoinc_1myisam.test