Tue Sep 13 19:23:04 2016 UTC ()
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)


(bsiegert)
diff -r1.52 -r1.52.2.1 pkgsrc/databases/mysql55-client/Makefile.common
diff -r1.50 -r1.50.2.1 pkgsrc/databases/mysql55-client/distinfo
diff -r1.42 -r1.42.2.1 pkgsrc/databases/mysql55-server/PLIST
diff -r1.33 -r1.33.2.1 pkgsrc/databases/mysql56-client/Makefile.common
diff -r1.35 -r1.35.2.1 pkgsrc/databases/mysql56-client/distinfo
diff -r1.4 -r1.4.16.1 pkgsrc/databases/mysql56-client/patches/patch-CMakeLists.txt
diff -r1.24 -r1.24.2.1 pkgsrc/databases/mysql56-server/PLIST
cvs diff -r1.52 -r1.52.2.1 pkgsrc/databases/mysql55-client/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql55-client/Attic/Makefile.common 2016/06/14 16:49:17 1.52
+++ pkgsrc/databases/mysql55-client/Attic/Makefile.common 2016/09/13 19:23:04 1.52.2.1
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile.common,v 1.52 2016/06/14 16:49:17 adam Exp $ 1# $NetBSD: Makefile.common,v 1.52.2.1 2016/09/13 19:23:04 bsiegert Exp $
2# 2#
3# used by databases/mysql55-client/Makefile 3# used by databases/mysql55-client/Makefile
4# used by databases/mysql55-server/Makefile 4# used by databases/mysql55-server/Makefile
5 5
6DISTNAME= mysql-5.5.50 6DISTNAME= mysql-5.5.52
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.5/} 8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.5/}
9 9
10MAINTAINER?= pkgsrc-users@NetBSD.org 10MAINTAINER?= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.mysql.com/ 11HOMEPAGE= http://www.mysql.com/
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql55-client/distinfo 14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql55-client/distinfo
15PATCHDIR?= ${.CURDIR}/../../databases/mysql55-client/patches 15PATCHDIR?= ${.CURDIR}/../../databases/mysql55-client/patches
16 16
17USE_CMAKE= yes 17USE_CMAKE= yes
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_TOOLS+= bash gmake perl:run 19USE_TOOLS+= bash gmake perl:run
cvs diff -r1.50 -r1.50.2.1 pkgsrc/databases/mysql55-client/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql55-client/Attic/distinfo 2016/06/14 16:49:17 1.50
+++ pkgsrc/databases/mysql55-client/Attic/distinfo 2016/09/13 19:23:04 1.50.2.1
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: distinfo,v 1.50 2016/06/14 16:49:17 adam Exp $ 1$NetBSD: distinfo,v 1.50.2.1 2016/09/13 19:23:04 bsiegert Exp $
2 2
3SHA1 (mysql-5.5.50.tar.gz) = 08b27227d66b39b7914c6b5a0e16012dd57048a9 3SHA1 (mysql-5.5.52.tar.gz) = 585b90289e2fd51b26b0696426ae25b2b01cfe6d
4RMD160 (mysql-5.5.50.tar.gz) = ac0cf9b983c2867dbfda4c64df959db229d894f4 4RMD160 (mysql-5.5.52.tar.gz) = 26125b7045073f7962d43df14135caa89e6b436c
5SHA512 (mysql-5.5.50.tar.gz) = 81d1327d8e99f57ba7dfd9f834f0e8e75f118b7a92375ca5799fa0cf66b0ec22cf2bd6f11f1d2d9c6bcb766a739743072cd4152f5d9c488203ac46f5471d980b 5SHA512 (mysql-5.5.52.tar.gz) = 78d88609c4a718d783d2ee5a82768df94bc0799831f95f587ae6d991659a42d17060bcff8e081f7523dbe0493c74167e1590a3a9ee543e65dc683c6e5fea0ce4
6Size (mysql-5.5.50.tar.gz) = 21029856 bytes 6Size (mysql-5.5.52.tar.gz) = 21032776 bytes
7SHA1 (sphinx-2.2.10-release.tar.gz) = 0f2372dd41df2848ea06c6076a86af6f0f66a071 7SHA1 (sphinx-2.2.11-release.tar.gz) = 34e83f43de0e69e258bf749ea00348c60a51632a
8RMD160 (sphinx-2.2.10-release.tar.gz) = 2712e8ce85609e78c53bd2d9fba877f1e630d5f2 8RMD160 (sphinx-2.2.11-release.tar.gz) = 5804b4cce64bc03fa20bac26c7391cd661cecc77
9SHA512 (sphinx-2.2.10-release.tar.gz) = 07683f64df730368563e11a7d2939b521837c9a04944ab7d6d09732ab06e451b674169eca4f85db2aae41d883bd16fb4d17b9265912fea9691d07d407d7212d8 9SHA512 (sphinx-2.2.11-release.tar.gz) = cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
10Size (sphinx-2.2.10-release.tar.gz) = 3109250 bytes 10Size (sphinx-2.2.11-release.tar.gz) = 3061998 bytes
11SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6 11SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
12SHA1 (patch-CMakeLists.txt) = 2040dc4904270327c9d64178a3d889ebde2ec5d5 12SHA1 (patch-CMakeLists.txt) = 2040dc4904270327c9d64178a3d889ebde2ec5d5
13SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf 13SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf
14SHA1 (patch-client_mysqladmin.cc) = c640d3ca742dc1b200701d21d82d8f2093917cf2 14SHA1 (patch-client_mysqladmin.cc) = c640d3ca742dc1b200701d21d82d8f2093917cf2
15SHA1 (patch-client_mysqlbinlog.cc) = e38abe026c10a07808ccd24b596cf13c5079e206 15SHA1 (patch-client_mysqlbinlog.cc) = e38abe026c10a07808ccd24b596cf13c5079e206
16SHA1 (patch-client_mysqlshow.c) = a12b06241eee91d1ec11e3b7e4f3125aa6c79905 16SHA1 (patch-client_mysqlshow.c) = a12b06241eee91d1ec11e3b7e4f3125aa6c79905
17SHA1 (patch-client_sql_string.cc) = 1547b8d3889af2831c89b97aecdbe8158711a600 17SHA1 (patch-client_sql_string.cc) = 1547b8d3889af2831c89b97aecdbe8158711a600
18SHA1 (patch-cmake_libutils.cmake) = 5d75a1762e3db6724bec2d75b45d40b17a5e9d09 18SHA1 (patch-cmake_libutils.cmake) = 5d75a1762e3db6724bec2d75b45d40b17a5e9d09
19SHA1 (patch-cmake_plugin.cmake) = 2b702af6bf8f251886cea12cf7477abae7659230 19SHA1 (patch-cmake_plugin.cmake) = 2b702af6bf8f251886cea12cf7477abae7659230
20SHA1 (patch-cmake_readline.cmake) = aed279d6740e70d7e0e7565a6d9f0f214c866c8d 20SHA1 (patch-cmake_readline.cmake) = aed279d6740e70d7e0e7565a6d9f0f214c866c8d
21SHA1 (patch-include_CMakeLists.txt) = 4781c69315624fb5567ae70cee87f1ddb3f89847 21SHA1 (patch-include_CMakeLists.txt) = 4781c69315624fb5567ae70cee87f1ddb3f89847
22SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5 22SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5
23SHA1 (patch-include_my_net.h) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af 23SHA1 (patch-include_my_net.h) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af
cvs diff -r1.42 -r1.42.2.1 pkgsrc/databases/mysql55-server/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/mysql55-server/Attic/PLIST 2016/06/14 16:49:17 1.42
+++ pkgsrc/databases/mysql55-server/Attic/PLIST 2016/09/13 19:23:04 1.42.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.42 2016/06/14 16:49:17 adam Exp $ 1@comment $NetBSD: PLIST,v 1.42.2.1 2016/09/13 19:23:04 bsiegert Exp $
2bin/innochecksum 2bin/innochecksum
3bin/my_print_defaults 3bin/my_print_defaults
4bin/myisam_ftdump 4bin/myisam_ftdump
5bin/myisamchk 5bin/myisamchk
6bin/myisamlog 6bin/myisamlog
7bin/myisampack 7bin/myisampack
8${PLIST.embedded}bin/mysql_client_test_embedded 8${PLIST.embedded}bin/mysql_client_test_embedded
9${PLIST.embedded}bin/mysql_embedded 9${PLIST.embedded}bin/mysql_embedded
10bin/mysql_tzinfo_to_sql 10bin/mysql_tzinfo_to_sql
11bin/mysql_waitpid 11bin/mysql_waitpid
12${PLIST.embedded}bin/mysqltest_embedded 12${PLIST.embedded}bin/mysqltest_embedded
13bin/perror 13bin/perror
14bin/replace 14bin/replace
@@ -3660,27 +3660,26 @@ share/mysql/test/suite/parts/t/partition @@ -3660,27 +3660,26 @@ share/mysql/test/suite/parts/t/partition
3660share/mysql/test/suite/parts/t/partition_special_innodb.test 3660share/mysql/test/suite/parts/t/partition_special_innodb.test
3661share/mysql/test/suite/parts/t/partition_special_myisam.test 3661share/mysql/test/suite/parts/t/partition_special_myisam.test
3662share/mysql/test/suite/parts/t/partition_syntax_innodb.test 3662share/mysql/test/suite/parts/t/partition_syntax_innodb.test
3663share/mysql/test/suite/parts/t/partition_syntax_myisam.test 3663share/mysql/test/suite/parts/t/partition_syntax_myisam.test
3664share/mysql/test/suite/parts/t/partition_value_innodb.test 3664share/mysql/test/suite/parts/t/partition_value_innodb.test
3665share/mysql/test/suite/parts/t/partition_value_myisam.test 3665share/mysql/test/suite/parts/t/partition_value_myisam.test
3666share/mysql/test/suite/parts/t/rpl_partition.test 3666share/mysql/test/suite/parts/t/rpl_partition.test
3667share/mysql/test/suite/perfschema/include/binlog_common.inc 3667share/mysql/test/suite/perfschema/include/binlog_common.inc
3668share/mysql/test/suite/perfschema/include/cleanup_helper.inc 3668share/mysql/test/suite/perfschema/include/cleanup_helper.inc
3669share/mysql/test/suite/perfschema/include/privilege.inc 3669share/mysql/test/suite/perfschema/include/privilege.inc
3670share/mysql/test/suite/perfschema/include/setup_helper.inc 3670share/mysql/test/suite/perfschema/include/setup_helper.inc
3671share/mysql/test/suite/perfschema/include/start_server_common.inc 3671share/mysql/test/suite/perfschema/include/start_server_common.inc
3672share/mysql/test/suite/perfschema/include/upgrade_check.inc 3672share/mysql/test/suite/perfschema/include/upgrade_check.inc
3673share/mysql/test/suite/perfschema/r/aggregate.result 
3674share/mysql/test/suite/perfschema/r/bad_option_1.result 3673share/mysql/test/suite/perfschema/r/bad_option_1.result
3675share/mysql/test/suite/perfschema/r/bad_option_2.result 3674share/mysql/test/suite/perfschema/r/bad_option_2.result
3676share/mysql/test/suite/perfschema/r/bad_option_3.result 3675share/mysql/test/suite/perfschema/r/bad_option_3.result
3677share/mysql/test/suite/perfschema/r/bad_option_4.result 3676share/mysql/test/suite/perfschema/r/bad_option_4.result
3678share/mysql/test/suite/perfschema/r/bad_option_5.result 3677share/mysql/test/suite/perfschema/r/bad_option_5.result
3679share/mysql/test/suite/perfschema/r/binlog_mix.result 3678share/mysql/test/suite/perfschema/r/binlog_mix.result
3680share/mysql/test/suite/perfschema/r/binlog_row.result 3679share/mysql/test/suite/perfschema/r/binlog_row.result
3681share/mysql/test/suite/perfschema/r/binlog_stmt.result 3680share/mysql/test/suite/perfschema/r/binlog_stmt.result
3682share/mysql/test/suite/perfschema/r/checksum.result 3681share/mysql/test/suite/perfschema/r/checksum.result
3683share/mysql/test/suite/perfschema/r/cnf_option.result 3682share/mysql/test/suite/perfschema/r/cnf_option.result
3684share/mysql/test/suite/perfschema/r/column_privilege.result 3683share/mysql/test/suite/perfschema/r/column_privilege.result
3685share/mysql/test/suite/perfschema/r/ddl_cond_instances.result 3684share/mysql/test/suite/perfschema/r/ddl_cond_instances.result
3686share/mysql/test/suite/perfschema/r/ddl_events_waits_current.result 3685share/mysql/test/suite/perfschema/r/ddl_events_waits_current.result
@@ -3741,27 +3740,26 @@ share/mysql/test/suite/perfschema/r/star @@ -3741,27 +3740,26 @@ share/mysql/test/suite/perfschema/r/star
3741share/mysql/test/suite/perfschema/r/start_server_no_mutex_class.result 3740share/mysql/test/suite/perfschema/r/start_server_no_mutex_class.result
3742share/mysql/test/suite/perfschema/r/start_server_no_mutex_inst.result 3741share/mysql/test/suite/perfschema/r/start_server_no_mutex_inst.result
3743share/mysql/test/suite/perfschema/r/start_server_no_rwlock_class.result 3742share/mysql/test/suite/perfschema/r/start_server_no_rwlock_class.result
3744share/mysql/test/suite/perfschema/r/start_server_no_rwlock_inst.result 3743share/mysql/test/suite/perfschema/r/start_server_no_rwlock_inst.result
3745share/mysql/test/suite/perfschema/r/start_server_no_thread_class.result 3744share/mysql/test/suite/perfschema/r/start_server_no_thread_class.result
3746share/mysql/test/suite/perfschema/r/start_server_no_thread_inst.result 3745share/mysql/test/suite/perfschema/r/start_server_no_thread_inst.result
3747share/mysql/test/suite/perfschema/r/start_server_no_waits_history.result 3746share/mysql/test/suite/perfschema/r/start_server_no_waits_history.result
3748share/mysql/test/suite/perfschema/r/start_server_no_waits_history_long.result 3747share/mysql/test/suite/perfschema/r/start_server_no_waits_history_long.result
3749share/mysql/test/suite/perfschema/r/start_server_nothing.result 3748share/mysql/test/suite/perfschema/r/start_server_nothing.result
3750share/mysql/test/suite/perfschema/r/start_server_off.result 3749share/mysql/test/suite/perfschema/r/start_server_off.result
3751share/mysql/test/suite/perfschema/r/start_server_on.result 3750share/mysql/test/suite/perfschema/r/start_server_on.result
3752share/mysql/test/suite/perfschema/r/tampered_perfschema_table1.result 3751share/mysql/test/suite/perfschema/r/tampered_perfschema_table1.result
3753share/mysql/test/suite/perfschema/r/thread_cache.result 3752share/mysql/test/suite/perfschema/r/thread_cache.result
3754share/mysql/test/suite/perfschema/t/aggregate.test 
3755share/mysql/test/suite/perfschema/t/bad_option_1.test 3753share/mysql/test/suite/perfschema/t/bad_option_1.test
3756share/mysql/test/suite/perfschema/t/bad_option_2.test 3754share/mysql/test/suite/perfschema/t/bad_option_2.test
3757share/mysql/test/suite/perfschema/t/bad_option_3.test 3755share/mysql/test/suite/perfschema/t/bad_option_3.test
3758share/mysql/test/suite/perfschema/t/bad_option_4.test 3756share/mysql/test/suite/perfschema/t/bad_option_4.test
3759share/mysql/test/suite/perfschema/t/bad_option_5.test 3757share/mysql/test/suite/perfschema/t/bad_option_5.test
3760share/mysql/test/suite/perfschema/t/binlog_mix.test 3758share/mysql/test/suite/perfschema/t/binlog_mix.test
3761share/mysql/test/suite/perfschema/t/binlog_row.test 3759share/mysql/test/suite/perfschema/t/binlog_row.test
3762share/mysql/test/suite/perfschema/t/binlog_stmt.test 3760share/mysql/test/suite/perfschema/t/binlog_stmt.test
3763share/mysql/test/suite/perfschema/t/checksum.test 3761share/mysql/test/suite/perfschema/t/checksum.test
3764share/mysql/test/suite/perfschema/t/cnf_option.cnf 3762share/mysql/test/suite/perfschema/t/cnf_option.cnf
3765share/mysql/test/suite/perfschema/t/cnf_option.test 3763share/mysql/test/suite/perfschema/t/cnf_option.test
3766share/mysql/test/suite/perfschema/t/column_privilege.test 3764share/mysql/test/suite/perfschema/t/column_privilege.test
3767share/mysql/test/suite/perfschema/t/ddl_cond_instances.test 3765share/mysql/test/suite/perfschema/t/ddl_cond_instances.test
cvs diff -r1.33 -r1.33.2.1 pkgsrc/databases/mysql56-client/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-client/Makefile.common 2016/06/15 11:30:39 1.33
+++ pkgsrc/databases/mysql56-client/Makefile.common 2016/09/13 19:23:04 1.33.2.1
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile.common,v 1.33 2016/06/15 11:30:39 adam Exp $ 1# $NetBSD: Makefile.common,v 1.33.2.1 2016/09/13 19:23:04 bsiegert Exp $
2# 2#
3# used by databases/mysql56-client/Makefile 3# used by databases/mysql56-client/Makefile
4# used by databases/mysql56-server/Makefile 4# used by databases/mysql56-server/Makefile
5 5
6DISTNAME= mysql-5.6.31 6DISTNAME= mysql-5.6.33
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.6/} 8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.6/}
9 9
10MAINTAINER?= pkgsrc-users@NetBSD.org 10MAINTAINER?= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.mysql.com/ 11HOMEPAGE= http://www.mysql.com/
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql56-client/distinfo 14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql56-client/distinfo
15PATCHDIR?= ${.CURDIR}/../../databases/mysql56-client/patches 15PATCHDIR?= ${.CURDIR}/../../databases/mysql56-client/patches
16 16
17USE_CMAKE= yes 17USE_CMAKE= yes
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_TOOLS+= bash gmake perl:run 19USE_TOOLS+= bash gmake perl:run
cvs diff -r1.35 -r1.35.2.1 pkgsrc/databases/mysql56-client/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-client/distinfo 2016/06/15 11:30:39 1.35
+++ pkgsrc/databases/mysql56-client/distinfo 2016/09/13 19:23:04 1.35.2.1
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: distinfo,v 1.35 2016/06/15 11:30:39 adam Exp $ 1$NetBSD: distinfo,v 1.35.2.1 2016/09/13 19:23:04 bsiegert Exp $
2 2
3SHA1 (mysql-5.6.31.tar.gz) = 9c687f4766bb0085b3d9e518b3a356879b230e58 3SHA1 (mysql-5.6.33.tar.gz) = 4f1c2e25ce681f92862a75ad52012fbe4017bf42
4RMD160 (mysql-5.6.31.tar.gz) = 4789473f9bcdf00328b9af9306f621a2d179dfb1 4RMD160 (mysql-5.6.33.tar.gz) = 2fa192fa1cec9d791cfa9b7347cb5cd9adc7944f
5SHA512 (mysql-5.6.31.tar.gz) = dc527e1d3ce7359a86fd91e9469d4ff1bb475c68bbb11aecb2a1897660fc09d0d26a401384117a2ad4e58cd709b5525facabef534e4f7b242119ce171d245cb1 5SHA512 (mysql-5.6.33.tar.gz) = d6f96dfd379b7ddaf3897a04ad756169a9d71319894551cba561e5ab2298dc21526004f656f50850c81bbe52af158926f87badc34d07b2b92107bc136e08359a
6Size (mysql-5.6.31.tar.gz) = 32098698 bytes 6Size (mysql-5.6.33.tar.gz) = 32094894 bytes
7SHA1 (sphinx-2.2.10-release.tar.gz) = 0f2372dd41df2848ea06c6076a86af6f0f66a071 7SHA1 (sphinx-2.2.11-release.tar.gz) = 34e83f43de0e69e258bf749ea00348c60a51632a
8RMD160 (sphinx-2.2.10-release.tar.gz) = 2712e8ce85609e78c53bd2d9fba877f1e630d5f2 8RMD160 (sphinx-2.2.11-release.tar.gz) = 5804b4cce64bc03fa20bac26c7391cd661cecc77
9SHA512 (sphinx-2.2.10-release.tar.gz) = 07683f64df730368563e11a7d2939b521837c9a04944ab7d6d09732ab06e451b674169eca4f85db2aae41d883bd16fb4d17b9265912fea9691d07d407d7212d8 9SHA512 (sphinx-2.2.11-release.tar.gz) = cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
10Size (sphinx-2.2.10-release.tar.gz) = 3109250 bytes 10Size (sphinx-2.2.11-release.tar.gz) = 3061998 bytes
11SHA1 (patch-CMakeLists.txt) = 1b5dd5a965f87027a03c5f2eaa1c7e6a43395cff 11SHA1 (patch-CMakeLists.txt) = cc14caabcb6ca55eba33595f98ad4b3db14504da
12SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb 12SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
13SHA1 (patch-client_mysql.cc) = 8f1fabf6f975dbffbeaef13426a43f9b7f4d5336 13SHA1 (patch-client_mysql.cc) = 8f1fabf6f975dbffbeaef13426a43f9b7f4d5336
14SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93 14SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
15SHA1 (patch-client_sql_string.h) = f26aff4ce4cf6dfef44c85ef95120331ca8fef52 15SHA1 (patch-client_sql_string.h) = f26aff4ce4cf6dfef44c85ef95120331ca8fef52
16SHA1 (patch-cmake_dtrace.cmake) = d953fdf976f3a7e7f0c2c16a9a2d2615f2777396 16SHA1 (patch-cmake_dtrace.cmake) = d953fdf976f3a7e7f0c2c16a9a2d2615f2777396
17SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356 17SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356
18SHA1 (patch-cmake_plugin.cmake) = 03e7a7debd61e870bd76d5c5b253a620662b3595 18SHA1 (patch-cmake_plugin.cmake) = 03e7a7debd61e870bd76d5c5b253a620662b3595
19SHA1 (patch-cmake_readline.cmake) = 5436d4bf4148e97deef2a9811a09e54503a4e744 19SHA1 (patch-cmake_readline.cmake) = 5436d4bf4148e97deef2a9811a09e54503a4e744
20SHA1 (patch-cmake_ssl.cmake) = a5a25b00010c6586e5a3e099975ddabe369d4247 20SHA1 (patch-cmake_ssl.cmake) = a5a25b00010c6586e5a3e099975ddabe369d4247
21SHA1 (patch-include_CMakeLists.txt) = 49d351a958e63c69ad8bfe5c50961fe3751e86c4 21SHA1 (patch-include_CMakeLists.txt) = 49d351a958e63c69ad8bfe5c50961fe3751e86c4
22SHA1 (patch-include_my__global.h) = 843b9527faf880eee59cf02239ba601f5985ddfb 22SHA1 (patch-include_my__global.h) = 843b9527faf880eee59cf02239ba601f5985ddfb
23SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5 23SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5
24SHA1 (patch-include_my_net.h) = b08aa36921efd023f9ecaac4cd3fb8a16d200abd 24SHA1 (patch-include_my_net.h) = b08aa36921efd023f9ecaac4cd3fb8a16d200abd
cvs diff -r1.4 -r1.4.16.1 pkgsrc/databases/mysql56-client/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-client/patches/patch-CMakeLists.txt 2014/08/10 15:11:57 1.4
+++ pkgsrc/databases/mysql56-client/patches/patch-CMakeLists.txt 2016/09/13 19:23:04 1.4.16.1
@@ -1,53 +1,53 @@ @@ -1,53 +1,53 @@
1$NetBSD: patch-CMakeLists.txt,v 1.4 2014/08/10 15:11:57 adam Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.4.16.1 2016/09/13 19:23:04 bsiegert Exp $
2 2
3Split configuration between mysql-client and mysql-server. 3Split configuration between mysql-client and mysql-server.
4Build with newer DTrace. 4Build with newer DTrace.
5 5
6--- CMakeLists.txt.orig 2014-07-18 15:48:39.000000000 +0000 6--- CMakeLists.txt.orig 2016-07-11 09:19:51.000000000 +0000
7+++ CMakeLists.txt 7+++ CMakeLists.txt
8@@ -215,6 +215,7 @@ IF(DISABLE_SHARED) 8@@ -202,6 +202,7 @@ IF(DISABLE_SHARED)
9 SET(WITHOUT_DYNAMIC_PLUGINS 1) 9 SET(WITHOUT_DYNAMIC_PLUGINS 1)
10 ENDIF() 10 ENDIF()
11 OPTION(ENABLED_PROFILING "Enable profiling" ON) 11 OPTION(ENABLED_PROFILING "Enable profiling" ON)
12+OPTION(ENABLE_DTRACE "Include support for DTrace probes" OFF) 12+OPTION(ENABLE_DTRACE "Include support for DTrace probes" OFF)
13 OPTION(CYBOZU "" OFF) 13 OPTION(CYBOZU "" OFF)
14 OPTION(BACKUP_TEST "" OFF) 14 OPTION(BACKUP_TEST "" OFF)
15 OPTION(WITHOUT_SERVER OFF) 15 OPTION(WITHOUT_SERVER OFF)
16@@ -472,7 +473,6 @@ ADD_SUBDIRECTORY(vio) 16@@ -462,7 +463,6 @@ ADD_SUBDIRECTORY(vio)
17 ADD_SUBDIRECTORY(regex) 17 ADD_SUBDIRECTORY(regex)
18 ADD_SUBDIRECTORY(mysys) 18 ADD_SUBDIRECTORY(mysys)
19 ADD_SUBDIRECTORY(mysys_ssl) 19 ADD_SUBDIRECTORY(mysys_ssl)
20-ADD_SUBDIRECTORY(libmysql) 20-ADD_SUBDIRECTORY(libmysql)
21  21
22 IF(WITH_UNIT_TESTS) 22 IF(WITH_UNIT_TESTS)
23 ADD_SUBDIRECTORY(unittest) 23 # Visual Studio 11 needs this extra flag in order to compile gmock.
24@@ -491,16 +491,16 @@ IF(WITH_UNIT_TESTS) 24@@ -480,16 +480,16 @@ IF(WITH_UNIT_TESTS)
25 ENDIF() 25 ENDIF()
26  26
27 ADD_SUBDIRECTORY(extra) 27 ADD_SUBDIRECTORY(extra)
28-ADD_SUBDIRECTORY(client) 28-ADD_SUBDIRECTORY(client)
29 ADD_SUBDIRECTORY(sql/share) 29 ADD_SUBDIRECTORY(sql/share)
30 ADD_SUBDIRECTORY(libservices) 30 ADD_SUBDIRECTORY(libservices)
31  31
32-IF(UNIX) 32-IF(UNIX)
33+IF(WITHOUT_SERVER) 33+IF(WITHOUT_SERVER)
34+ ADD_SUBDIRECTORY(libmysql) 34+ ADD_SUBDIRECTORY(libmysql)
35+ ADD_SUBDIRECTORY(client) 35+ ADD_SUBDIRECTORY(client)
36+ ADD_SUBDIRECTORY(scripts) 36+ ADD_SUBDIRECTORY(scripts)
37 ADD_SUBDIRECTORY(man) 37 ADD_SUBDIRECTORY(man)
38-ENDIF() 38-ENDIF()
39- 39-
40-IF(NOT WITHOUT_SERVER) 40-IF(NOT WITHOUT_SERVER)
41 ADD_SUBDIRECTORY(tests) 41 ADD_SUBDIRECTORY(tests)
42+ELSE() 42+ELSE()
43 ADD_SUBDIRECTORY(sql) 43 ADD_SUBDIRECTORY(sql)
44 OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) 44 OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
45 IF(WITH_EMBEDDED_SERVER)  45 IF(WITH_EMBEDDED_SERVER)
46@@ -511,7 +511,6 @@ ENDIF() 46@@ -500,7 +500,6 @@ ENDIF()
47  47
48 # scripts/mysql_config depends on client and server targets loaded above. 48 # scripts/mysql_config depends on client and server targets loaded above.
49 # It is referenced by some of the directories below, so we insert it here. 49 # It is referenced by some of the directories below, so we insert it here.
50-ADD_SUBDIRECTORY(scripts) 50-ADD_SUBDIRECTORY(scripts)
51  51
52 IF(NOT WITHOUT_SERVER) 52 IF(NOT WITHOUT_SERVER)
53 ADD_SUBDIRECTORY(mysql-test) 53 ADD_SUBDIRECTORY(mysql-test)
cvs diff -r1.24 -r1.24.2.1 pkgsrc/databases/mysql56-server/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-server/PLIST 2016/06/15 11:30:40 1.24
+++ pkgsrc/databases/mysql56-server/PLIST 2016/09/13 19:23:04 1.24.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.24 2016/06/15 11:30:40 adam Exp $ 1@comment $NetBSD: PLIST,v 1.24.2.1 2016/09/13 19:23:04 bsiegert Exp $
2bin/innochecksum 2bin/innochecksum
3bin/my_print_defaults 3bin/my_print_defaults
4bin/myisam_ftdump 4bin/myisam_ftdump
5bin/myisamchk 5bin/myisamchk
6bin/myisamlog 6bin/myisamlog
7bin/myisampack 7bin/myisampack
8${PLIST.embedded}bin/mysql_client_test_embedded 8${PLIST.embedded}bin/mysql_client_test_embedded
9${PLIST.embedded}bin/mysql_embedded 9${PLIST.embedded}bin/mysql_embedded
10bin/mysql_tzinfo_to_sql 10bin/mysql_tzinfo_to_sql
11bin/mysql_waitpid 11bin/mysql_waitpid
12${PLIST.embedded}bin/mysqltest_embedded 12${PLIST.embedded}bin/mysqltest_embedded
13bin/perror 13bin/perror
14bin/replace 14bin/replace
@@ -630,27 +630,26 @@ share/mysql/test/include/order_by.inc @@ -630,27 +630,26 @@ share/mysql/test/include/order_by.inc
630share/mysql/test/include/parser_bug21114.inc 630share/mysql/test/include/parser_bug21114.inc
631share/mysql/test/include/partition_date_range.inc 631share/mysql/test/include/partition_date_range.inc
632share/mysql/test/include/partition_default_functions.inc 632share/mysql/test/include/partition_default_functions.inc
633share/mysql/test/include/plugin.defs 633share/mysql/test/include/plugin.defs
634share/mysql/test/include/print_greedy_search_count.inc 634share/mysql/test/include/print_greedy_search_count.inc
635share/mysql/test/include/ps_conv.inc 635share/mysql/test/include/ps_conv.inc
636share/mysql/test/include/ps_create.inc 636share/mysql/test/include/ps_create.inc
637share/mysql/test/include/ps_ddl_1.inc 637share/mysql/test/include/ps_ddl_1.inc
638share/mysql/test/include/ps_modify.inc 638share/mysql/test/include/ps_modify.inc
639share/mysql/test/include/ps_modify1.inc 639share/mysql/test/include/ps_modify1.inc
640share/mysql/test/include/ps_query.inc 640share/mysql/test/include/ps_query.inc
641share/mysql/test/include/ps_renew.inc 641share/mysql/test/include/ps_renew.inc
642share/mysql/test/include/purge_first_log.inc 642share/mysql/test/include/purge_first_log.inc
643share/mysql/test/include/python_with_json.inc 
644share/mysql/test/include/query_cache.inc 643share/mysql/test/include/query_cache.inc
645share/mysql/test/include/query_cache_sql_prepare.inc 644share/mysql/test/include/query_cache_sql_prepare.inc
646share/mysql/test/include/rand.inc 645share/mysql/test/include/rand.inc
647share/mysql/test/include/range.inc 646share/mysql/test/include/range.inc
648share/mysql/test/include/read_file_to_var.inc 647share/mysql/test/include/read_file_to_var.inc
649share/mysql/test/include/read_many_rows.inc 648share/mysql/test/include/read_many_rows.inc
650share/mysql/test/include/relocate_binlogs.inc 649share/mysql/test/include/relocate_binlogs.inc
651share/mysql/test/include/report-features.test 650share/mysql/test/include/report-features.test
652share/mysql/test/include/restart_mysqld.inc 651share/mysql/test/include/restart_mysqld.inc
653share/mysql/test/include/restart_readonly_mysqld.inc 652share/mysql/test/include/restart_readonly_mysqld.inc
654share/mysql/test/include/restart_slave_sql.inc 653share/mysql/test/include/restart_slave_sql.inc
655share/mysql/test/include/rowid_order.inc 654share/mysql/test/include/rowid_order.inc
656share/mysql/test/include/rpl_change_topology.inc 655share/mysql/test/include/rpl_change_topology.inc
@@ -1675,26 +1674,27 @@ share/mysql/test/r/udf.result @@ -1675,26 +1674,27 @@ share/mysql/test/r/udf.result
1675share/mysql/test/r/udf_services.result 1674share/mysql/test/r/udf_services.result
1676share/mysql/test/r/udf_skip_grants.result 1675share/mysql/test/r/udf_skip_grants.result
1677share/mysql/test/r/union.result 1676share/mysql/test/r/union.result
1678share/mysql/test/r/unsafe_binlog_innodb.result 1677share/mysql/test/r/unsafe_binlog_innodb.result
1679share/mysql/test/r/update.result 1678share/mysql/test/r/update.result
1680share/mysql/test/r/upgrade.result 1679share/mysql/test/r/upgrade.result
1681share/mysql/test/r/user_limits.result 1680share/mysql/test/r/user_limits.result
1682share/mysql/test/r/user_var-binlog.result 1681share/mysql/test/r/user_var-binlog.result
1683share/mysql/test/r/user_var.result 1682share/mysql/test/r/user_var.result
1684share/mysql/test/r/validate_password_plugin.result 1683share/mysql/test/r/validate_password_plugin.result
1685share/mysql/test/r/varbinary.result 1684share/mysql/test/r/varbinary.result
1686share/mysql/test/r/variables-big.result 1685share/mysql/test/r/variables-big.result
1687share/mysql/test/r/variables-notembedded.result 1686share/mysql/test/r/variables-notembedded.result
 1687share/mysql/test/r/variables-win.result
1688share/mysql/test/r/variables.result 1688share/mysql/test/r/variables.result
1689share/mysql/test/r/variables_community.result 1689share/mysql/test/r/variables_community.result
1690share/mysql/test/r/variables_debug.result 1690share/mysql/test/r/variables_debug.result
1691share/mysql/test/r/view.result 1691share/mysql/test/r/view.result
1692share/mysql/test/r/view_alias.result 1692share/mysql/test/r/view_alias.result
1693share/mysql/test/r/view_grant.result 1693share/mysql/test/r/view_grant.result
1694share/mysql/test/r/wait_timeout.result 1694share/mysql/test/r/wait_timeout.result
1695share/mysql/test/r/warnings.result 1695share/mysql/test/r/warnings.result
1696share/mysql/test/r/warnings_engine_disabled.result 1696share/mysql/test/r/warnings_engine_disabled.result
1697share/mysql/test/r/windows.require 1697share/mysql/test/r/windows.require
1698share/mysql/test/r/windows.result 1698share/mysql/test/r/windows.result
1699share/mysql/test/r/wl6219-csv.result 1699share/mysql/test/r/wl6219-csv.result
1700share/mysql/test/r/wl6219-innodb.result 1700share/mysql/test/r/wl6219-innodb.result
@@ -3486,26 +3486,27 @@ share/mysql/test/suite/innodb/r/innodb-a @@ -3486,26 +3486,27 @@ share/mysql/test/suite/innodb/r/innodb-a
3486share/mysql/test/suite/innodb/r/innodb-autoinc-optimize.result 3486share/mysql/test/suite/innodb/r/innodb-autoinc-optimize.result
3487share/mysql/test/suite/innodb/r/innodb-autoinc.result 3487share/mysql/test/suite/innodb/r/innodb-autoinc.result
3488share/mysql/test/suite/innodb/r/innodb-blob.result 3488share/mysql/test/suite/innodb/r/innodb-blob.result
3489share/mysql/test/suite/innodb/r/innodb-bug-14068765.result 3489share/mysql/test/suite/innodb/r/innodb-bug-14068765.result
3490share/mysql/test/suite/innodb/r/innodb-bug-14084530.result 3490share/mysql/test/suite/innodb/r/innodb-bug-14084530.result
3491share/mysql/test/suite/innodb/r/innodb-bug12552164.result 3491share/mysql/test/suite/innodb/r/innodb-bug12552164.result
3492share/mysql/test/suite/innodb/r/innodb-bug14219515.result 3492share/mysql/test/suite/innodb/r/innodb-bug14219515.result
3493share/mysql/test/suite/innodb/r/innodb-change-buffer-recovery.result 3493share/mysql/test/suite/innodb/r/innodb-change-buffer-recovery.result
3494share/mysql/test/suite/innodb/r/innodb-consistent.result 3494share/mysql/test/suite/innodb/r/innodb-consistent.result
3495share/mysql/test/suite/innodb/r/innodb-double-write.result 3495share/mysql/test/suite/innodb/r/innodb-double-write.result
3496share/mysql/test/suite/innodb/r/innodb-index-debug.result 3496share/mysql/test/suite/innodb/r/innodb-index-debug.result
3497share/mysql/test/suite/innodb/r/innodb-index-online-delete.result 3497share/mysql/test/suite/innodb/r/innodb-index-online-delete.result
3498share/mysql/test/suite/innodb/r/innodb-index-online-fk.result 3498share/mysql/test/suite/innodb/r/innodb-index-online-fk.result
 3499share/mysql/test/suite/innodb/r/innodb-index-online-norebuild.result
3499share/mysql/test/suite/innodb/r/innodb-index-online-purge.result 3500share/mysql/test/suite/innodb/r/innodb-index-online-purge.result
3500share/mysql/test/suite/innodb/r/innodb-index-online.result 3501share/mysql/test/suite/innodb/r/innodb-index-online.result
3501share/mysql/test/suite/innodb/r/innodb-index.result 3502share/mysql/test/suite/innodb/r/innodb-index.result
3502share/mysql/test/suite/innodb/r/innodb-index_ucs2.result 3503share/mysql/test/suite/innodb/r/innodb-index_ucs2.result
3503share/mysql/test/suite/innodb/r/innodb-lock-inherit-read_commited.result 3504share/mysql/test/suite/innodb/r/innodb-lock-inherit-read_commited.result
3504share/mysql/test/suite/innodb/r/innodb-lock.result 3505share/mysql/test/suite/innodb/r/innodb-lock.result
3505share/mysql/test/suite/innodb/r/innodb-log-file-size-1.result 3506share/mysql/test/suite/innodb/r/innodb-log-file-size-1.result
3506share/mysql/test/suite/innodb/r/innodb-log-file-size.result 3507share/mysql/test/suite/innodb/r/innodb-log-file-size.result
3507share/mysql/test/suite/innodb/r/innodb-multiple-tablespaces.result 3508share/mysql/test/suite/innodb/r/innodb-multiple-tablespaces.result
3508share/mysql/test/suite/innodb/r/innodb-read-view.result 3509share/mysql/test/suite/innodb/r/innodb-read-view.result
3509share/mysql/test/suite/innodb/r/innodb-replace.result 3510share/mysql/test/suite/innodb/r/innodb-replace.result
3510share/mysql/test/suite/innodb/r/innodb-semi-consistent.result 3511share/mysql/test/suite/innodb/r/innodb-semi-consistent.result
3511share/mysql/test/suite/innodb/r/innodb-status-output.result 3512share/mysql/test/suite/innodb/r/innodb-status-output.result
@@ -3690,26 +3691,27 @@ share/mysql/test/suite/innodb/t/innodb-b @@ -3690,26 +3691,27 @@ share/mysql/test/suite/innodb/t/innodb-b
3690share/mysql/test/suite/innodb/t/innodb-bug-14084530.test 3691share/mysql/test/suite/innodb/t/innodb-bug-14084530.test
3691share/mysql/test/suite/innodb/t/innodb-bug12552164.test 3692share/mysql/test/suite/innodb/t/innodb-bug12552164.test
3692share/mysql/test/suite/innodb/t/innodb-bug14219515.test 3693share/mysql/test/suite/innodb/t/innodb-bug14219515.test
3693share/mysql/test/suite/innodb/t/innodb-change-buffer-recovery-master.opt 3694share/mysql/test/suite/innodb/t/innodb-change-buffer-recovery-master.opt
3694share/mysql/test/suite/innodb/t/innodb-change-buffer-recovery.test 3695share/mysql/test/suite/innodb/t/innodb-change-buffer-recovery.test
3695share/mysql/test/suite/innodb/t/innodb-consistent-master.opt 3696share/mysql/test/suite/innodb/t/innodb-consistent-master.opt
3696share/mysql/test/suite/innodb/t/innodb-consistent.test 3697share/mysql/test/suite/innodb/t/innodb-consistent.test
3697share/mysql/test/suite/innodb/t/innodb-double-write.test 3698share/mysql/test/suite/innodb/t/innodb-double-write.test
3698share/mysql/test/suite/innodb/t/innodb-index-debug-master.opt 3699share/mysql/test/suite/innodb/t/innodb-index-debug-master.opt
3699share/mysql/test/suite/innodb/t/innodb-index-debug.test 3700share/mysql/test/suite/innodb/t/innodb-index-debug.test
3700share/mysql/test/suite/innodb/t/innodb-index-online-delete.test 3701share/mysql/test/suite/innodb/t/innodb-index-online-delete.test
3701share/mysql/test/suite/innodb/t/innodb-index-online-fk.test 3702share/mysql/test/suite/innodb/t/innodb-index-online-fk.test
3702share/mysql/test/suite/innodb/t/innodb-index-online-master.opt 3703share/mysql/test/suite/innodb/t/innodb-index-online-master.opt
 3704share/mysql/test/suite/innodb/t/innodb-index-online-norebuild.test
3703share/mysql/test/suite/innodb/t/innodb-index-online-purge.test 3705share/mysql/test/suite/innodb/t/innodb-index-online-purge.test
3704share/mysql/test/suite/innodb/t/innodb-index-online.test 3706share/mysql/test/suite/innodb/t/innodb-index-online.test
3705share/mysql/test/suite/innodb/t/innodb-index.test 3707share/mysql/test/suite/innodb/t/innodb-index.test
3706share/mysql/test/suite/innodb/t/innodb-index_ucs2.test 3708share/mysql/test/suite/innodb/t/innodb-index_ucs2.test
3707share/mysql/test/suite/innodb/t/innodb-lock-inherit-read_commited.test 3709share/mysql/test/suite/innodb/t/innodb-lock-inherit-read_commited.test
3708share/mysql/test/suite/innodb/t/innodb-lock.test 3710share/mysql/test/suite/innodb/t/innodb-lock.test
3709share/mysql/test/suite/innodb/t/innodb-log-file-size-1.test 3711share/mysql/test/suite/innodb/t/innodb-log-file-size-1.test
3710share/mysql/test/suite/innodb/t/innodb-log-file-size.test 3712share/mysql/test/suite/innodb/t/innodb-log-file-size.test
3711share/mysql/test/suite/innodb/t/innodb-master.opt 3713share/mysql/test/suite/innodb/t/innodb-master.opt
3712share/mysql/test/suite/innodb/t/innodb-multiple-tablespaces.test 3714share/mysql/test/suite/innodb/t/innodb-multiple-tablespaces.test
3713share/mysql/test/suite/innodb/t/innodb-read-view.test 3715share/mysql/test/suite/innodb/t/innodb-read-view.test
3714share/mysql/test/suite/innodb/t/innodb-replace.test 3716share/mysql/test/suite/innodb/t/innodb-replace.test
3715share/mysql/test/suite/innodb/t/innodb-semi-consistent-master.opt 3717share/mysql/test/suite/innodb/t/innodb-semi-consistent-master.opt
@@ -4998,27 +5000,27 @@ share/mysql/test/suite/opt_trace/t/files @@ -4998,27 +5000,27 @@ share/mysql/test/suite/opt_trace/t/files
4998share/mysql/test/suite/opt_trace/t/general2_no_prot.test 5000share/mysql/test/suite/opt_trace/t/general2_no_prot.test
4999share/mysql/test/suite/opt_trace/t/general2_ps_prot.test 5001share/mysql/test/suite/opt_trace/t/general2_ps_prot.test
5000share/mysql/test/suite/opt_trace/t/general_no_prot_all.test 5002share/mysql/test/suite/opt_trace/t/general_no_prot_all.test
5001share/mysql/test/suite/opt_trace/t/general_no_prot_none.test 5003share/mysql/test/suite/opt_trace/t/general_no_prot_none.test
5002share/mysql/test/suite/opt_trace/t/general_ps_prot_all.test 5004share/mysql/test/suite/opt_trace/t/general_ps_prot_all.test
5003share/mysql/test/suite/opt_trace/t/general_ps_prot_none.test 5005share/mysql/test/suite/opt_trace/t/general_ps_prot_none.test
5004share/mysql/test/suite/opt_trace/t/range_no_prot.test 5006share/mysql/test/suite/opt_trace/t/range_no_prot.test
5005share/mysql/test/suite/opt_trace/t/range_ps_prot.test 5007share/mysql/test/suite/opt_trace/t/range_ps_prot.test
5006share/mysql/test/suite/opt_trace/t/security_no_prot.test 5008share/mysql/test/suite/opt_trace/t/security_no_prot.test
5007share/mysql/test/suite/opt_trace/t/security_ps_prot.test 5009share/mysql/test/suite/opt_trace/t/security_ps_prot.test
5008share/mysql/test/suite/opt_trace/t/subquery_no_prot.test 5010share/mysql/test/suite/opt_trace/t/subquery_no_prot.test
5009share/mysql/test/suite/opt_trace/t/subquery_ps_prot.test 5011share/mysql/test/suite/opt_trace/t/subquery_ps_prot.test
5010share/mysql/test/suite/opt_trace/t/temp_table.test 5012share/mysql/test/suite/opt_trace/t/temp_table.test
5011share/mysql/test/suite/opt_trace/validate_json.py 5013share/mysql/test/suite/opt_trace/validate_json.pl
5012share/mysql/test/suite/parts/inc/methods1.inc 5014share/mysql/test/suite/parts/inc/methods1.inc
5013share/mysql/test/suite/parts/inc/part_blocked_sql_funcs_main.inc 5015share/mysql/test/suite/parts/inc/part_blocked_sql_funcs_main.inc
5014share/mysql/test/suite/parts/inc/part_exch_drop_tabs.inc 5016share/mysql/test/suite/parts/inc/part_exch_drop_tabs.inc
5015share/mysql/test/suite/parts/inc/part_exch_qa.inc 5017share/mysql/test/suite/parts/inc/part_exch_qa.inc
5016share/mysql/test/suite/parts/inc/part_exch_qa_1.inc 5018share/mysql/test/suite/parts/inc/part_exch_qa_1.inc
5017share/mysql/test/suite/parts/inc/part_exch_qa_13.inc 5019share/mysql/test/suite/parts/inc/part_exch_qa_13.inc
5018share/mysql/test/suite/parts/inc/part_exch_qa_4.inc 5020share/mysql/test/suite/parts/inc/part_exch_qa_4.inc
5019share/mysql/test/suite/parts/inc/part_exch_qa_5.inc 5021share/mysql/test/suite/parts/inc/part_exch_qa_5.inc
5020share/mysql/test/suite/parts/inc/part_exch_qa_7.inc 5022share/mysql/test/suite/parts/inc/part_exch_qa_7.inc
5021share/mysql/test/suite/parts/inc/part_exch_qa_8.inc 5023share/mysql/test/suite/parts/inc/part_exch_qa_8.inc
5022share/mysql/test/suite/parts/inc/part_exch_tabs.inc 5024share/mysql/test/suite/parts/inc/part_exch_tabs.inc
5023share/mysql/test/suite/parts/inc/part_supported_sql_funcs_delete.inc 5025share/mysql/test/suite/parts/inc/part_supported_sql_funcs_delete.inc
5024share/mysql/test/suite/parts/inc/part_supported_sql_funcs_main.inc 5026share/mysql/test/suite/parts/inc/part_supported_sql_funcs_main.inc
@@ -5468,27 +5470,26 @@ share/mysql/test/suite/perfschema/includ @@ -5468,27 +5470,26 @@ share/mysql/test/suite/perfschema/includ
5468share/mysql/test/suite/perfschema/include/stage_cleanup.inc 5470share/mysql/test/suite/perfschema/include/stage_cleanup.inc
5469share/mysql/test/suite/perfschema/include/stage_setup.inc 5471share/mysql/test/suite/perfschema/include/stage_setup.inc
5470share/mysql/test/suite/perfschema/include/start_server_common.inc 5472share/mysql/test/suite/perfschema/include/start_server_common.inc
5471share/mysql/test/suite/perfschema/include/table_aggregate_cleanup.inc 5473share/mysql/test/suite/perfschema/include/table_aggregate_cleanup.inc
5472share/mysql/test/suite/perfschema/include/table_aggregate_load.inc 5474share/mysql/test/suite/perfschema/include/table_aggregate_load.inc
5473share/mysql/test/suite/perfschema/include/table_aggregate_setup.inc 5475share/mysql/test/suite/perfschema/include/table_aggregate_setup.inc
5474share/mysql/test/suite/perfschema/include/table_io_basic_dml.inc 5476share/mysql/test/suite/perfschema/include/table_io_basic_dml.inc
5475share/mysql/test/suite/perfschema/include/table_io_cleanup_helper.inc 5477share/mysql/test/suite/perfschema/include/table_io_cleanup_helper.inc
5476share/mysql/test/suite/perfschema/include/table_io_result_helper.inc 5478share/mysql/test/suite/perfschema/include/table_io_result_helper.inc
5477share/mysql/test/suite/perfschema/include/table_io_setup_helper.inc 5479share/mysql/test/suite/perfschema/include/table_io_setup_helper.inc
5478share/mysql/test/suite/perfschema/include/upgrade_check.inc 5480share/mysql/test/suite/perfschema/include/upgrade_check.inc
5479share/mysql/test/suite/perfschema/include/wait_for_pfs_thread_count.inc 5481share/mysql/test/suite/perfschema/include/wait_for_pfs_thread_count.inc
5480share/mysql/test/suite/perfschema/include/wait_till_sleep.inc 5482share/mysql/test/suite/perfschema/include/wait_till_sleep.inc
5481share/mysql/test/suite/perfschema/r/aggregate.result 
5482share/mysql/test/suite/perfschema/r/all_tests.result 5483share/mysql/test/suite/perfschema/r/all_tests.result
5483share/mysql/test/suite/perfschema/r/bad_option_1.result 5484share/mysql/test/suite/perfschema/r/bad_option_1.result
5484share/mysql/test/suite/perfschema/r/bad_option_2.result 5485share/mysql/test/suite/perfschema/r/bad_option_2.result
5485share/mysql/test/suite/perfschema/r/bad_option_3.result 5486share/mysql/test/suite/perfschema/r/bad_option_3.result
5486share/mysql/test/suite/perfschema/r/bad_option_4.result 5487share/mysql/test/suite/perfschema/r/bad_option_4.result
5487share/mysql/test/suite/perfschema/r/bad_option_5.result 5488share/mysql/test/suite/perfschema/r/bad_option_5.result
5488share/mysql/test/suite/perfschema/r/binlog_edge_mix.result 5489share/mysql/test/suite/perfschema/r/binlog_edge_mix.result
5489share/mysql/test/suite/perfschema/r/binlog_edge_row.result 5490share/mysql/test/suite/perfschema/r/binlog_edge_row.result
5490share/mysql/test/suite/perfschema/r/binlog_edge_stmt.result 5491share/mysql/test/suite/perfschema/r/binlog_edge_stmt.result
5491share/mysql/test/suite/perfschema/r/binlog_ok_mix.result 5492share/mysql/test/suite/perfschema/r/binlog_ok_mix.result
5492share/mysql/test/suite/perfschema/r/binlog_ok_row.result 5493share/mysql/test/suite/perfschema/r/binlog_ok_row.result
5493share/mysql/test/suite/perfschema/r/binlog_ok_stmt.result 5494share/mysql/test/suite/perfschema/r/binlog_ok_stmt.result
5494share/mysql/test/suite/perfschema/r/checksum.result 5495share/mysql/test/suite/perfschema/r/checksum.result
@@ -5786,27 +5787,26 @@ share/mysql/test/suite/perfschema/r/tabl @@ -5786,27 +5787,26 @@ share/mysql/test/suite/perfschema/r/tabl
5786share/mysql/test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result 5787share/mysql/test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result
5787share/mysql/test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result 5788share/mysql/test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result
5788share/mysql/test/suite/perfschema/r/table_name.result 5789share/mysql/test/suite/perfschema/r/table_name.result
5789share/mysql/test/suite/perfschema/r/table_schema.result 5790share/mysql/test/suite/perfschema/r/table_schema.result
5790share/mysql/test/suite/perfschema/r/tampered_perfschema_table1.result 5791share/mysql/test/suite/perfschema/r/tampered_perfschema_table1.result
5791share/mysql/test/suite/perfschema/r/temp_table_io.result 5792share/mysql/test/suite/perfschema/r/temp_table_io.result
5792share/mysql/test/suite/perfschema/r/thread_cache.result 5793share/mysql/test/suite/perfschema/r/thread_cache.result
5793share/mysql/test/suite/perfschema/r/threads_innodb.result 5794share/mysql/test/suite/perfschema/r/threads_innodb.result
5794share/mysql/test/suite/perfschema/r/threads_insert_delayed.result 5795share/mysql/test/suite/perfschema/r/threads_insert_delayed.result
5795share/mysql/test/suite/perfschema/r/threads_mysql.result 5796share/mysql/test/suite/perfschema/r/threads_mysql.result
5796share/mysql/test/suite/perfschema/r/trigger_table_io.result 5797share/mysql/test/suite/perfschema/r/trigger_table_io.result
5797share/mysql/test/suite/perfschema/r/unary_digest.result 5798share/mysql/test/suite/perfschema/r/unary_digest.result
5798share/mysql/test/suite/perfschema/r/view_table_io.result 5799share/mysql/test/suite/perfschema/r/view_table_io.result
5799share/mysql/test/suite/perfschema/t/aggregate.test 
5800share/mysql/test/suite/perfschema/t/all_tests.test 5800share/mysql/test/suite/perfschema/t/all_tests.test
5801share/mysql/test/suite/perfschema/t/bad_option_1.test 5801share/mysql/test/suite/perfschema/t/bad_option_1.test
5802share/mysql/test/suite/perfschema/t/bad_option_2.test 5802share/mysql/test/suite/perfschema/t/bad_option_2.test
5803share/mysql/test/suite/perfschema/t/bad_option_3.test 5803share/mysql/test/suite/perfschema/t/bad_option_3.test
5804share/mysql/test/suite/perfschema/t/bad_option_4.test 5804share/mysql/test/suite/perfschema/t/bad_option_4.test
5805share/mysql/test/suite/perfschema/t/bad_option_5.test 5805share/mysql/test/suite/perfschema/t/bad_option_5.test
5806share/mysql/test/suite/perfschema/t/binlog_edge_mix-master.opt 5806share/mysql/test/suite/perfschema/t/binlog_edge_mix-master.opt
5807share/mysql/test/suite/perfschema/t/binlog_edge_mix.test 5807share/mysql/test/suite/perfschema/t/binlog_edge_mix.test
5808share/mysql/test/suite/perfschema/t/binlog_edge_row-master.opt 5808share/mysql/test/suite/perfschema/t/binlog_edge_row-master.opt
5809share/mysql/test/suite/perfschema/t/binlog_edge_row.test 5809share/mysql/test/suite/perfschema/t/binlog_edge_row.test
5810share/mysql/test/suite/perfschema/t/binlog_edge_stmt-master.opt 5810share/mysql/test/suite/perfschema/t/binlog_edge_stmt-master.opt
5811share/mysql/test/suite/perfschema/t/binlog_edge_stmt.test 5811share/mysql/test/suite/perfschema/t/binlog_edge_stmt.test
5812share/mysql/test/suite/perfschema/t/binlog_ok_mix-master.opt 5812share/mysql/test/suite/perfschema/t/binlog_ok_mix-master.opt
@@ -9776,26 +9776,27 @@ share/mysql/test/t/unsafe_binlog_innodb- @@ -9776,26 +9776,27 @@ share/mysql/test/t/unsafe_binlog_innodb-
9776share/mysql/test/t/unsafe_binlog_innodb.test 9776share/mysql/test/t/unsafe_binlog_innodb.test
9777share/mysql/test/t/update.test 9777share/mysql/test/t/update.test
9778share/mysql/test/t/upgrade.test 9778share/mysql/test/t/upgrade.test
9779share/mysql/test/t/user_limits.test 9779share/mysql/test/t/user_limits.test
9780share/mysql/test/t/user_var-binlog.test 9780share/mysql/test/t/user_var-binlog.test
9781share/mysql/test/t/user_var.test 9781share/mysql/test/t/user_var.test
9782share/mysql/test/t/validate_password_plugin-master.opt 9782share/mysql/test/t/validate_password_plugin-master.opt
9783share/mysql/test/t/validate_password_plugin.test 9783share/mysql/test/t/validate_password_plugin.test
9784share/mysql/test/t/varbinary.test 9784share/mysql/test/t/varbinary.test
9785share/mysql/test/t/variables-big.test 9785share/mysql/test/t/variables-big.test
9786share/mysql/test/t/variables-master.opt 9786share/mysql/test/t/variables-master.opt
9787share/mysql/test/t/variables-notembedded-master.opt 9787share/mysql/test/t/variables-notembedded-master.opt
9788share/mysql/test/t/variables-notembedded.test 9788share/mysql/test/t/variables-notembedded.test
 9789share/mysql/test/t/variables-win.test
9789share/mysql/test/t/variables.test 9790share/mysql/test/t/variables.test
9790share/mysql/test/t/variables_community.test 9791share/mysql/test/t/variables_community.test
9791share/mysql/test/t/variables_debug.test 9792share/mysql/test/t/variables_debug.test
9792share/mysql/test/t/view.test 9793share/mysql/test/t/view.test
9793share/mysql/test/t/view_alias.test 9794share/mysql/test/t/view_alias.test
9794share/mysql/test/t/view_grant.test 9795share/mysql/test/t/view_grant.test
9795share/mysql/test/t/wait_timeout.test 9796share/mysql/test/t/wait_timeout.test
9796share/mysql/test/t/warnings-master.opt 9797share/mysql/test/t/warnings-master.opt
9797share/mysql/test/t/warnings.test 9798share/mysql/test/t/warnings.test
9798share/mysql/test/t/warnings_engine_disabled.test 9799share/mysql/test/t/warnings_engine_disabled.test
9799share/mysql/test/t/windows.test 9800share/mysql/test/t/windows.test
9800share/mysql/test/t/wl4435_generated.inc 9801share/mysql/test/t/wl4435_generated.inc
9801share/mysql/test/t/wl6219-csv.test 9802share/mysql/test/t/wl6219-csv.test