Pullup ticket #5101 - requested by maya

databases/mysql55-client: security fix
databases/mysql56-client: security fix

Revisions pulled up:
- databases/mysql55-client/Makefile.common                      1.54
- databases/mysql55-client/distinfo                             1.52
- databases/mysql55-server/PLIST                                1.44
- databases/mysql56-client/Makefile.common                      1.35
- databases/mysql56-client/distinfo                             1.37
- databases/mysql56-client/patches/patch-CMakeLists.txt         1.5
- databases/mysql56-server/PLIST                                1.26

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Wed Sep  7 13:13:36 UTC 2016

   Modified Files:
   	pkgsrc/databases/mysql55-client: Makefile.common distinfo
   	pkgsrc/databases/mysql55-server: PLIST

   Log Message:
   Changes in MySQL 5.5.52 (2016-09-06)

   Bugs Fixed
   ----------
   Replication: mysqlbinlog --read-from-remote-server log1 log2 was opening a new \
   connection for log2 without freeing the connection used for log1. Thanks to Laurynas \
   Biveinis for the contribution. (Bug 81675, Bug 23540182)

   For mysqld_safe, the argument to --malloc-lib now must be one of the directories \
   /usr/lib, /usr/lib64, /usr/lib/i386-linux-gnu, or /usr/lib/x86_64-linux-gnu. In \
   addition, the --mysqld and --mysqld-version options can be used only on the command \
   line and not in an option file. (Bug 24464380)

   It was possible to write log files ending with .ini or .cnf that later could be \
   parsed as option files. The general query log and slow query log can no longer be \
   written to a file ending with .ini or .cnf. (Bug 24388753)

   Privilege escalation was possible by exploiting the way REPAIR TABLE used temporary \
   files. (Bug 24388746)

   Certain internal character-handling functions could fail to handle a too-large \
   character and cause a server exit. (Bug 23296299)

   A blank server name in CREATE SERVER statements produced a server exit rather than an \
   error. (Bug 23295288)

   The optimizer failed to check a function return value for an area calculation, \
   leading to a server exit. (Bug 23280059)

   A prepared statement that used a parameter in the select list of a derived table that \
   was part of a join could cause a server exit. (Bug 22392374, Bug 24380263)

   MEDIUMINT columns used in operations with long integer values could result in buffer \
   overflow. (Bug 19984392)

   EINTR handling in the client library has been fixed so that interrupted read and \
   write calls are retried. Previously, EINTR was ignored. (Bug 82019, Bug 23703570)

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Wed Sep  7 12:58:25 UTC 2016

   Modified Files:
   	pkgsrc/databases/mysql56-client: Makefile.common distinfo
   	pkgsrc/databases/mysql56-server: PLIST

   Log Message:
   Changes in MySQL 5.6.33 (2016-09-06)

   Test Suite Notes
   ----------------
   In mysql-test-run.pl, a limit of 50 was imposed on the number of workers for parallel \
   testing, which on systems with more than 50 CPUs resulted in exhaustion of unique \
   thread IDs. The ID-exhaustion problem has been corrected, and the limit of 50 on \
   number of workers has been lifted. Thanks to Daniel Black for the patch on which this \
   change was based. Additionally, these changes were made:

   To avoid idle workers, the number of parallel workers now is limited to the number of \
   tests.

   Previously, if --parallel=auto was given and the MTR_MAX_PARALLEL environment \
   variable was not set, a limit of 8 was imposed on the number of parallel workers. \
   This limit has been lifted.

   (Bug 22342399, Bug 79585)

   Functionality Added or Changed
   ------------------------------
   CMake support for compiling with Solaris Studio 12.5 was added. (Bug 82249, Bug \
   24303829, Bug 81274, Bug 23212938)

   Bugs Fixed
   ----------
   InnoDB: An operation that dropped and created a full-text search table raised an \
   assertion. (Bug 24315031)

   InnoDB: Accessing full-text search auxiliary tables while dropping the indexed table \
   raised an assertion. (Bug 24009272)

   InnoDB: An online DDL operation on a table with indexed BLOB columns raised an \
   assertion during logging of table modifications. (Bug 23760086)

   Replication: mysqlbinlog --read-from-remote-server log1 log2 was opening a new \
   connection for log2 without freeing the connection used for log1. Thanks to Laurynas \
   Biveinis for the contribution. (Bug 81675, Bug 23540182)

   Replication: With binlog_row_image=FULL, when updating single tables temporary tables \
   were unnecessarily being used. The fix ensures single table update follows the same \
   pattern as multi-table update. (Bug 79867, Bug 22510353)

   For mysqld_safe, the argument to --malloc-lib now must be one of the directories \
   /usr/lib, /usr/lib64, /usr/lib/i386-linux-gnu, or /usr/lib/x86_64-linux-gnu. In \
   addition, the --mysqld and --mysqld-version options can be used only on the command \
   line and not in an option file. (Bug 24464380)

   It was possible to write log files ending with .ini or .cnf that later could be \
   parsed as option files. The general query log and slow query log can no longer be \
   written to a file ending with .ini or .cnf. (Bug 24388753)

   Privilege escalation was possible by exploiting the way REPAIR TABLE used temporary \
   files. (Bug 24388746)

   If the basedir system variable was set at server startup from the command line or \
   option file, the value was not normalized (on Windows, / was not replaced with /). \
   (Bug 23747899, Bug 82125)

   In-place ALTER TABLE operations which when executed separately caused no table \
   rebuild could when combined into a single statement result in a table rebuild. (Bug \
   23475211, Bug 81587)

   A blank server name in CREATE SERVER statements produced a server exit rather than an \
   error. (Bug 23295288)

   A prepared statement that used a parameter in the select list of a derived table that \
   was part of a join could cause a server exit. (Bug 22392374, Bug 24380263)

   MEDIUMINT columns used in operations with long integer values could result in buffer \
   overflow. (Bug 19984392)

   A spurious ER_NO_SUCH_TABLE error could occur when attempting to execute a prepared \
   CREATE TABLE ... SELECT statement that used a temporary table in the FROM clause and \
   called a stored function. The same error could occur for a nonprepared version of the \
   statement if used in a stored procedure when the procedure was re-executed. (Bug \
   16672723, Bug 68972)

   EINTR handling in the client library has been fixed so that interrupted read and \
   write calls are retried. Previously, EINTR was ignored. (Bug 82019, Bug 23703570)

7 files changed, 37 insertions, 38 deletions

diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index 9499186c7f5..48e0d60c75b 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.52 2016/06/14 16:49:17 adam Exp $
+# $NetBSD: Makefile.common,v 1.52.2.1 2016/09/13 19:23:04 bsiegert Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.50
+DISTNAME=	mysql-5.5.52
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
 
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index 68dc0bb5440..35ae9dfb484 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.50 2016/06/14 16:49:17 adam Exp $
+$NetBSD: distinfo,v 1.50.2.1 2016/09/13 19:23:04 bsiegert Exp $
 
-SHA1 (mysql-5.5.50.tar.gz) = 08b27227d66b39b7914c6b5a0e16012dd57048a9
-RMD160 (mysql-5.5.50.tar.gz) = ac0cf9b983c2867dbfda4c64df959db229d894f4
-SHA512 (mysql-5.5.50.tar.gz) = 81d1327d8e99f57ba7dfd9f834f0e8e75f118b7a92375ca5799fa0cf66b0ec22cf2bd6f11f1d2d9c6bcb766a739743072cd4152f5d9c488203ac46f5471d980b
-Size (mysql-5.5.50.tar.gz) = 21029856 bytes
-SHA1 (sphinx-2.2.10-release.tar.gz) = 0f2372dd41df2848ea06c6076a86af6f0f66a071
-RMD160 (sphinx-2.2.10-release.tar.gz) = 2712e8ce85609e78c53bd2d9fba877f1e630d5f2
-SHA512 (sphinx-2.2.10-release.tar.gz) = 07683f64df730368563e11a7d2939b521837c9a04944ab7d6d09732ab06e451b674169eca4f85db2aae41d883bd16fb4d17b9265912fea9691d07d407d7212d8
-Size (sphinx-2.2.10-release.tar.gz) = 3109250 bytes
+SHA1 (mysql-5.5.52.tar.gz) = 585b90289e2fd51b26b0696426ae25b2b01cfe6d
+RMD160 (mysql-5.5.52.tar.gz) = 26125b7045073f7962d43df14135caa89e6b436c
+SHA512 (mysql-5.5.52.tar.gz) = 78d88609c4a718d783d2ee5a82768df94bc0799831f95f587ae6d991659a42d17060bcff8e081f7523dbe0493c74167e1590a3a9ee543e65dc683c6e5fea0ce4
+Size (mysql-5.5.52.tar.gz) = 21032776 bytes
+SHA1 (sphinx-2.2.11-release.tar.gz) = 34e83f43de0e69e258bf749ea00348c60a51632a
+RMD160 (sphinx-2.2.11-release.tar.gz) = 5804b4cce64bc03fa20bac26c7391cd661cecc77
+SHA512 (sphinx-2.2.11-release.tar.gz) = cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
+Size (sphinx-2.2.11-release.tar.gz) = 3061998 bytes
 SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
 SHA1 (patch-CMakeLists.txt) = 2040dc4904270327c9d64178a3d889ebde2ec5d5
 SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf
diff --git a/databases/mysql55-server/PLIST b/databases/mysql55-server/PLIST
index 4030c1a0099..5e50116771d 100644
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.42 2016/06/14 16:49:17 adam Exp $
+@comment $NetBSD: PLIST,v 1.42.2.1 2016/09/13 19:23:04 bsiegert Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -3670,7 +3670,6 @@ share/mysql/test/suite/perfschema/include/privilege.inc
 share/mysql/test/suite/perfschema/include/setup_helper.inc
 share/mysql/test/suite/perfschema/include/start_server_common.inc
 share/mysql/test/suite/perfschema/include/upgrade_check.inc
-share/mysql/test/suite/perfschema/r/aggregate.result
 share/mysql/test/suite/perfschema/r/bad_option_1.result
 share/mysql/test/suite/perfschema/r/bad_option_2.result
 share/mysql/test/suite/perfschema/r/bad_option_3.result
@@ -3751,7 +3750,6 @@ share/mysql/test/suite/perfschema/r/start_server_off.result
 share/mysql/test/suite/perfschema/r/start_server_on.result
 share/mysql/test/suite/perfschema/r/tampered_perfschema_table1.result
 share/mysql/test/suite/perfschema/r/thread_cache.result
-share/mysql/test/suite/perfschema/t/aggregate.test
 share/mysql/test/suite/perfschema/t/bad_option_1.test
 share/mysql/test/suite/perfschema/t/bad_option_2.test
 share/mysql/test/suite/perfschema/t/bad_option_3.test
diff --git a/databases/mysql56-client/Makefile.common b/databases/mysql56-client/Makefile.common
index ecd1b90cd50..8cc5d2a03c0 100644
--- a/databases/mysql56-client/Makefile.common
+++ b/databases/mysql56-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.33 2016/06/15 11:30:39 adam Exp $
+# $NetBSD: Makefile.common,v 1.33.2.1 2016/09/13 19:23:04 bsiegert Exp $
 #
 # used by databases/mysql56-client/Makefile
 # used by databases/mysql56-server/Makefile
 
-DISTNAME=	mysql-5.6.31
+DISTNAME=	mysql-5.6.33
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.6/}
 
diff --git a/databases/mysql56-client/distinfo b/databases/mysql56-client/distinfo
index 7795d147a6e..8e3ce02e4dd 100644
--- a/databases/mysql56-client/distinfo
+++ b/databases/mysql56-client/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.35 2016/06/15 11:30:39 adam Exp $
+$NetBSD: distinfo,v 1.35.2.1 2016/09/13 19:23:04 bsiegert Exp $
 
-SHA1 (mysql-5.6.31.tar.gz) = 9c687f4766bb0085b3d9e518b3a356879b230e58
-RMD160 (mysql-5.6.31.tar.gz) = 4789473f9bcdf00328b9af9306f621a2d179dfb1
-SHA512 (mysql-5.6.31.tar.gz) = dc527e1d3ce7359a86fd91e9469d4ff1bb475c68bbb11aecb2a1897660fc09d0d26a401384117a2ad4e58cd709b5525facabef534e4f7b242119ce171d245cb1
-Size (mysql-5.6.31.tar.gz) = 32098698 bytes
-SHA1 (sphinx-2.2.10-release.tar.gz) = 0f2372dd41df2848ea06c6076a86af6f0f66a071
-RMD160 (sphinx-2.2.10-release.tar.gz) = 2712e8ce85609e78c53bd2d9fba877f1e630d5f2
-SHA512 (sphinx-2.2.10-release.tar.gz) = 07683f64df730368563e11a7d2939b521837c9a04944ab7d6d09732ab06e451b674169eca4f85db2aae41d883bd16fb4d17b9265912fea9691d07d407d7212d8
-Size (sphinx-2.2.10-release.tar.gz) = 3109250 bytes
-SHA1 (patch-CMakeLists.txt) = 1b5dd5a965f87027a03c5f2eaa1c7e6a43395cff
+SHA1 (mysql-5.6.33.tar.gz) = 4f1c2e25ce681f92862a75ad52012fbe4017bf42
+RMD160 (mysql-5.6.33.tar.gz) = 2fa192fa1cec9d791cfa9b7347cb5cd9adc7944f
+SHA512 (mysql-5.6.33.tar.gz) = d6f96dfd379b7ddaf3897a04ad756169a9d71319894551cba561e5ab2298dc21526004f656f50850c81bbe52af158926f87badc34d07b2b92107bc136e08359a
+Size (mysql-5.6.33.tar.gz) = 32094894 bytes
+SHA1 (sphinx-2.2.11-release.tar.gz) = 34e83f43de0e69e258bf749ea00348c60a51632a
+RMD160 (sphinx-2.2.11-release.tar.gz) = 5804b4cce64bc03fa20bac26c7391cd661cecc77
+SHA512 (sphinx-2.2.11-release.tar.gz) = cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
+Size (sphinx-2.2.11-release.tar.gz) = 3061998 bytes
+SHA1 (patch-CMakeLists.txt) = cc14caabcb6ca55eba33595f98ad4b3db14504da
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysql.cc) = 8f1fabf6f975dbffbeaef13426a43f9b7f4d5336
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
diff --git a/databases/mysql56-client/patches/patch-CMakeLists.txt b/databases/mysql56-client/patches/patch-CMakeLists.txt
index cd2f38892fb..1858e3ac5ba 100644
--- a/databases/mysql56-client/patches/patch-CMakeLists.txt
+++ b/databases/mysql56-client/patches/patch-CMakeLists.txt
@@ -1,11 +1,11 @@
-$NetBSD: patch-CMakeLists.txt,v 1.4 2014/08/10 15:11:57 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4.16.1 2016/09/13 19:23:04 bsiegert Exp $
 
 Split configuration between mysql-client and mysql-server.
 Build with newer DTrace.
 
---- CMakeLists.txt.orig	2014-07-18 15:48:39.000000000 +0000
+--- CMakeLists.txt.orig	2016-07-11 09:19:51.000000000 +0000
 +++ CMakeLists.txt
-@@ -215,6 +215,7 @@ IF(DISABLE_SHARED)
+@@ -202,6 +202,7 @@ IF(DISABLE_SHARED)
    SET(WITHOUT_DYNAMIC_PLUGINS 1)
  ENDIF()
  OPTION(ENABLED_PROFILING "Enable profiling" ON)
@@ -13,15 +13,15 @@ Build with newer DTrace.
  OPTION(CYBOZU "" OFF)
  OPTION(BACKUP_TEST "" OFF)
  OPTION(WITHOUT_SERVER OFF)
-@@ -472,7 +473,6 @@ ADD_SUBDIRECTORY(vio)
+@@ -462,7 +463,6 @@ ADD_SUBDIRECTORY(vio)
  ADD_SUBDIRECTORY(regex)
  ADD_SUBDIRECTORY(mysys)
  ADD_SUBDIRECTORY(mysys_ssl)
 -ADD_SUBDIRECTORY(libmysql)
  
  IF(WITH_UNIT_TESTS)
-   ADD_SUBDIRECTORY(unittest)
-@@ -491,16 +491,16 @@ IF(WITH_UNIT_TESTS)
+   # Visual Studio 11 needs this extra flag in order to compile gmock.
+@@ -480,16 +480,16 @@ IF(WITH_UNIT_TESTS)
  ENDIF()
  
  ADD_SUBDIRECTORY(extra)
@@ -43,7 +43,7 @@ Build with newer DTrace.
    ADD_SUBDIRECTORY(sql)
    OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
    IF(WITH_EMBEDDED_SERVER) 
-@@ -511,7 +511,6 @@ ENDIF()
+@@ -500,7 +500,6 @@ ENDIF()
  
  # scripts/mysql_config depends on client and server targets loaded above.
  # It is referenced by some of the directories below, so we insert it here.
diff --git a/databases/mysql56-server/PLIST b/databases/mysql56-server/PLIST
index a232ef91b9e..529066a9835 100644
--- a/databases/mysql56-server/PLIST
+++ b/databases/mysql56-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2016/06/15 11:30:40 adam Exp $
+@comment $NetBSD: PLIST,v 1.24.2.1 2016/09/13 19:23:04 bsiegert Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -640,7 +640,6 @@ share/mysql/test/include/ps_modify1.inc
 share/mysql/test/include/ps_query.inc
 share/mysql/test/include/ps_renew.inc
 share/mysql/test/include/purge_first_log.inc
-share/mysql/test/include/python_with_json.inc
 share/mysql/test/include/query_cache.inc
 share/mysql/test/include/query_cache_sql_prepare.inc
 share/mysql/test/include/rand.inc
@@ -1685,6 +1684,7 @@ share/mysql/test/r/validate_password_plugin.result
 share/mysql/test/r/varbinary.result
 share/mysql/test/r/variables-big.result
 share/mysql/test/r/variables-notembedded.result
+share/mysql/test/r/variables-win.result
 share/mysql/test/r/variables.result
 share/mysql/test/r/variables_community.result
 share/mysql/test/r/variables_debug.result
@@ -3496,6 +3496,7 @@ share/mysql/test/suite/innodb/r/innodb-double-write.result
 share/mysql/test/suite/innodb/r/innodb-index-debug.result
 share/mysql/test/suite/innodb/r/innodb-index-online-delete.result
 share/mysql/test/suite/innodb/r/innodb-index-online-fk.result
+share/mysql/test/suite/innodb/r/innodb-index-online-norebuild.result
 share/mysql/test/suite/innodb/r/innodb-index-online-purge.result
 share/mysql/test/suite/innodb/r/innodb-index-online.result
 share/mysql/test/suite/innodb/r/innodb-index.result
@@ -3700,6 +3701,7 @@ share/mysql/test/suite/innodb/t/innodb-index-debug.test
 share/mysql/test/suite/innodb/t/innodb-index-online-delete.test
 share/mysql/test/suite/innodb/t/innodb-index-online-fk.test
 share/mysql/test/suite/innodb/t/innodb-index-online-master.opt
+share/mysql/test/suite/innodb/t/innodb-index-online-norebuild.test
 share/mysql/test/suite/innodb/t/innodb-index-online-purge.test
 share/mysql/test/suite/innodb/t/innodb-index-online.test
 share/mysql/test/suite/innodb/t/innodb-index.test
@@ -5008,7 +5010,7 @@ share/mysql/test/suite/opt_trace/t/security_ps_prot.test
 share/mysql/test/suite/opt_trace/t/subquery_no_prot.test
 share/mysql/test/suite/opt_trace/t/subquery_ps_prot.test
 share/mysql/test/suite/opt_trace/t/temp_table.test
-share/mysql/test/suite/opt_trace/validate_json.py
+share/mysql/test/suite/opt_trace/validate_json.pl
 share/mysql/test/suite/parts/inc/methods1.inc
 share/mysql/test/suite/parts/inc/part_blocked_sql_funcs_main.inc
 share/mysql/test/suite/parts/inc/part_exch_drop_tabs.inc
@@ -5478,7 +5480,6 @@ share/mysql/test/suite/perfschema/include/table_io_setup_helper.inc
 share/mysql/test/suite/perfschema/include/upgrade_check.inc
 share/mysql/test/suite/perfschema/include/wait_for_pfs_thread_count.inc
 share/mysql/test/suite/perfschema/include/wait_till_sleep.inc
-share/mysql/test/suite/perfschema/r/aggregate.result
 share/mysql/test/suite/perfschema/r/all_tests.result
 share/mysql/test/suite/perfschema/r/bad_option_1.result
 share/mysql/test/suite/perfschema/r/bad_option_2.result
@@ -5796,7 +5797,6 @@ share/mysql/test/suite/perfschema/r/threads_mysql.result
 share/mysql/test/suite/perfschema/r/trigger_table_io.result
 share/mysql/test/suite/perfschema/r/unary_digest.result
 share/mysql/test/suite/perfschema/r/view_table_io.result
-share/mysql/test/suite/perfschema/t/aggregate.test
 share/mysql/test/suite/perfschema/t/all_tests.test
 share/mysql/test/suite/perfschema/t/bad_option_1.test
 share/mysql/test/suite/perfschema/t/bad_option_2.test
@@ -9786,6 +9786,7 @@ share/mysql/test/t/variables-big.test
 share/mysql/test/t/variables-master.opt
 share/mysql/test/t/variables-notembedded-master.opt
 share/mysql/test/t/variables-notembedded.test
+share/mysql/test/t/variables-win.test
 share/mysql/test/t/variables.test
 share/mysql/test/t/variables_community.test
 share/mysql/test/t/variables_debug.test