Pullup ticket #4373 - requested by taca

databases/mysql55-client: security update
databases/mysql56-server: update to keep in sync with with "mysql55-client"

Revisions pulled up:
- databases/mysql55-client/Makefile                             1.16
- databases/mysql55-client/Makefile.common                      1.35
- databases/mysql55-client/distinfo                             1.32
- databases/mysql55-client/patches/patch-libmysql_CMakeLists.txt 1.2
- databases/mysql55-server/Makefile                             1.20
- databases/mysql55-server/PLIST                                1.28

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Mon Mar 31 08:03:23 UTC 2014

   Modified Files:
   	pkgsrc/databases/mysql55-client: Makefile Makefile.common distinfo
   	pkgsrc/databases/mysql55-client/patches: patch-libmysql_CMakeLists.txt
   	pkgsrc/databases/mysql55-server: Makefile PLIST

   Log Message:
   Changes 5.5.37:

   Functionality Added or Changed

   On Solaris, mysql_config --libs now includes -R/path/to/library so that libraries can be found at runtime.

   Bugs Fixed

   InnoDB: A regression introduced by Bug 14329288 would result in a performance degradation when a compressed table does not fit into memory.

   InnoDB: The maximum value for innodb_thread_sleep_delay is now 1000000 microseconds. The previous maximum value (4294967295 microseconds on 32-bit and 18446744073709551615 microseconds on 64-bit) was unnecessarily large. Because the maximum value of innodb_thread_sleep_delay is limited by the value set for innodb_adaptive_max_sleep_delay (when set to a non-zero value), the maximum value for innodb_thread_sleep_delay is now the same as the maximum value for innodb_adaptive_max_sleep_delay.

   InnoDB: In debug builds, creating a unique index on a binary column, with input data containing duplicate keys, would cause an assertion.

   InnoDB: InnoDB would fail to start when innodb_data_file_path specified the data file size in kilobytes by appending K to the size value.

   InnoDB: An insert buffer merge would cause an assertion error due to incorrectly handled ownership information for externally stored BLOBs.

   InnoDB: Assertion failure in thread thread_num in file ibuf0ibuf.cc line 4080
   InnoDB: Failing assertion: rec_get_deleted_flag(rec, page_is_comp(page))

   InnoDB: Decreasing the auto_increment_increment value would have no affect on the next auto-increment value.

   Replication: The server did not handle correctly the insertion of a row larger than 4 GB when using row-based replication.

   Replication: When using row-based replication, an additional auto-increment column on the slave version of a table was not updated correctly; a zero was inserted instead.

   Replication: Statements involving the Performance Schema tables should not be written to the binary log, because the content of these tables is applicable only to a given MySQL Server instance, and may differ greatly between different servers in a replication topology. The database administrator should be able to configure (INSERT, UPDATE, or DELETE) or flush (TRUNCATE TABLE) performance schema tables on a single server without affecting others. However, when replicating from a MySQL 5.5 master to a MySQL 5.5 or later slave, warnings about unsafe statements updating Performance Schema tables were elevated to errors. For MySQL 5.6 and later slaves, this prevented the simultaneous use of performance_schema and GTIDs (see Replication with Global Transaction Identifiers, in the MySQL 5.6 Manual).

   This fix causes all updates on tables in the performance_schema database to be filtered on the master and not replicated, regardless of the type of logging that is in effect. Prior to this fix, statements using were handled by being marked as unsafe for replication, which caused warnings during execution; the statements were nonetheless written to the binary log, regardless of the logging format in effect.

   Existing replication behavior for tables in the INFORMATION_SCHEMA database is not changed by this fix.

   For more information, see MySQL Performance Schema.

   Compilation failed if MySQL was configured with CFLAGS set to include a -Werror option with an argument.

   A shared libmysqld embedded server library was not built on Linux.

   While printing the server version, the mysql client did not check for buffer overflow in a string variable.

   Contraction information in a collation could be mishandled, resulting in incorrect decisions about whether a character is part of a contraction, and miscalculation of contraction weights.

   DROP TRIGGER succeeded even with the read_only system variable enabled.

   Updating the Performance Schema setup_instruments table on a replication master caused a slave to exit.

   Due to a race condition, it was possible for two threads to end up with the same query ID for different queries.

   When run by root, mysqld --help --verbose exited with a nonzero error code after displaying the help message.

   MySQL client programs from a Community Edition distribution could not connect using SSL to a MySQL server from an Enterprise Edition. This was due to a difference in certificate handling by yaSSL and OpenSSL (used for Community and Enterprise, respectively). OpenSSL expected a blank certificate to be sent when not all of the --ssl-ca, --ssl-cert, and --ssl-key options were specified, and yaSSL did not do so. To resolve this, yaSSL has been modified to send a blank certificate when an option is missing.

   A deadlock error occurring during subquery execution could cause an assertion to be raised.

   The Performance Schema stage/sql/Waiting to get readlock instrument is no longer used and has been removed.

   For system variables that take a string value, SET statements permitted an unquoted value, but values that contained dots were parsed incorrectly and only part of the value was assigned. For example, SET GLOBAL slow_query_log_file = my_slow.log assigned the value my_slow. Now such values must be quoted or an error occurs.

   On Windows, mysql_install_db.pl could be run only from within the bin directory under the installation directory.

6 files changed, 24 insertions, 24 deletions

diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index 0c0dcbc3b70..51a5685cf7b 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2014/02/12 23:17:39 tron Exp $
+# $NetBSD: Makefile,v 1.15.2.1 2014/04/14 15:29:21 tron Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	1
 SVR4_PKGNAME=	mysqc
 COMMENT=	MySQL 5, a free SQL database (client)
 
diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index afcad3cd56c..82e519d478b 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.34 2014/02/01 11:16:03 adam Exp $
+# $NetBSD: Makefile.common,v 1.34.2.1 2014/04/14 15:29:21 tron Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.36
+DISTNAME=	mysql-5.5.37
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
 
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index 9dea683fcdd..01d716966c6 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.31 2014/02/13 15:47:15 jperkin Exp $
+$NetBSD: distinfo,v 1.31.2.1 2014/04/14 15:29:21 tron Exp $
 
-SHA1 (mysql-5.5.36.tar.gz) = 581d49e1a38d5536c8268350e2f91ed9d461909d
-RMD160 (mysql-5.5.36.tar.gz) = 7651338751545a30652836d9c7bb0d3102592180
-Size (mysql-5.5.36.tar.gz) = 21723910 bytes
+SHA1 (mysql-5.5.37.tar.gz) = b5f15ff72c86358693c250203e7cb9c20fbe5f7f
+RMD160 (mysql-5.5.37.tar.gz) = 1af56fc6d508a512fbac3372a0db50722b8c5f4e
+Size (mysql-5.5.37.tar.gz) = 21718944 bytes
 SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
 SHA1 (patch-CMakeLists.txt) = 632e036cd9578d0636328c2259a8529c36f2d14a
 SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf
@@ -18,7 +18,7 @@ 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) = 475070d41b06c04c6ae692743fc1b0244afe0a88
-SHA1 (patch-libmysql_CMakeLists.txt) = 83deca6faca4116a088db87bf359524e3e6cd3ff
+SHA1 (patch-libmysql_CMakeLists.txt) = 80c8a7d1c1ed8dca49fba647aba31561981f3913
 SHA1 (patch-mysql-test_CMakeLists.txt) = d089a79df443ab2d8f97e7a1334aee2098dbb892
 SHA1 (patch-mysys_stacktrace.c) = 294b043984f740b99ba25abc8256ce8ad54d84c3
 SHA1 (patch-scripts_CMakeLists.txt) = 17ec1d8d5f0c9e453c64f2b59e757e645a3a1a59
diff --git a/databases/mysql55-client/patches/patch-libmysql_CMakeLists.txt b/databases/mysql55-client/patches/patch-libmysql_CMakeLists.txt
index eb744c0b05b..419a7c3b302 100644
--- a/databases/mysql55-client/patches/patch-libmysql_CMakeLists.txt
+++ b/databases/mysql55-client/patches/patch-libmysql_CMakeLists.txt
@@ -1,11 +1,11 @@
-$NetBSD: patch-libmysql_CMakeLists.txt,v 1.1 2013/12/15 18:45:19 asau Exp $
+$NetBSD: patch-libmysql_CMakeLists.txt,v 1.1.4.1 2014/04/14 15:29:21 tron Exp $
 
 Use uniform shared library names to avoid packaging list divergence.
 
---- libmysql/CMakeLists.txt.orig	2013-11-05 07:19:26.000000000 +0000
-+++ libmysql/CMakeLists.txt	2013-12-15 17:49:19.435504292 +0000
-@@ -193,13 +193,13 @@
-   MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries)
+--- libmysql/CMakeLists.txt.orig	2014-03-14 18:58:32.000000000 +0000
++++ libmysql/CMakeLists.txt
+@@ -207,14 +207,8 @@ IF(NOT DISABLE_SHARED)
+     COMPONENT SharedLibraries)
    IF(UNIX)
      # libtool compatability
 -    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
@@ -13,14 +13,10 @@ Use uniform shared library names to avoid packaging list divergence.
 -    ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
 -      SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0")
 -    ELSE()
-+#    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-+#      SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
-+#    ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
-+#      SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0")
-+#    ELSE()
-       SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0.0")
+-      SET(OS_SHARED_LIB_VERSION
++    SET(OS_SHARED_LIB_VERSION
+         "${SHARED_LIB_MAJOR_VERSION}.${SHARED_LIB_MINOR_VERSION}.0")
 -    ENDIF()
-+#    ENDIF()
      # Name of shared library is mysqlclient on Unix
      SET_TARGET_PROPERTIES(libmysql PROPERTIES 
        OUTPUT_NAME mysqlclient 
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 9f6d0357a0c..24ed168cc4b 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2014/03/11 14:34:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.19.2.1 2014/04/14 15:29:21 tron Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	1
 SVR4_PKGNAME=	mysqs
 COMMENT=	MySQL 5, a free SQL database (server)
 
diff --git a/databases/mysql55-server/PLIST b/databases/mysql55-server/PLIST
index 29a7392da27..3373a1b873e 100644
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2014/03/11 14:05:00 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.27.2.1 2014/04/14 15:29:21 tron Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -2898,6 +2898,8 @@ share/mysql/test/suite/funcs_2/t/innodb_charset.test
 share/mysql/test/suite/funcs_2/t/memory_charset.test
 share/mysql/test/suite/funcs_2/t/myisam_charset.test
 share/mysql/test/suite/funcs_2/t/suite.opt
+share/mysql/test/suite/innodb/r/blob-update-debug.result
+share/mysql/test/suite/innodb/r/create-index.result
 share/mysql/test/suite/innodb/r/innodb-analyze.result
 share/mysql/test/suite/innodb/r/innodb-autoinc-18274.result
 share/mysql/test/suite/innodb/r/innodb-autoinc-44030.result
@@ -2915,6 +2917,7 @@ share/mysql/test/suite/innodb/r/innodb-semi-consistent.result
 share/mysql/test/suite/innodb/r/innodb-timeout.result
 share/mysql/test/suite/innodb/r/innodb-truncate.result
 share/mysql/test/suite/innodb/r/innodb-ucs2.result
+share/mysql/test/suite/innodb/r/innodb-update-insert.result
 share/mysql/test/suite/innodb/r/innodb-use-sys-malloc.result
 share/mysql/test/suite/innodb/r/innodb.result
 share/mysql/test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
@@ -2993,6 +2996,8 @@ 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/blob-update-debug.test
+share/mysql/test/suite/innodb/t/create-index.test
 share/mysql/test/suite/innodb/t/disabled.def
 share/mysql/test/suite/innodb/t/innodb-analyze.test
 share/mysql/test/suite/innodb/t/innodb-autoinc-18274.test
@@ -3018,6 +3023,7 @@ share/mysql/test/suite/innodb/t/innodb-semi-consistent.test
 share/mysql/test/suite/innodb/t/innodb-timeout.test
 share/mysql/test/suite/innodb/t/innodb-truncate.test
 share/mysql/test/suite/innodb/t/innodb-ucs2.test
+share/mysql/test/suite/innodb/t/innodb-update-insert.test
 share/mysql/test/suite/innodb/t/innodb-use-sys-malloc-master.opt
 share/mysql/test/suite/innodb/t/innodb-use-sys-malloc.test
 share/mysql/test/suite/innodb/t/innodb.test