Sat Jul 29 20:10:59 2017 UTC ()
Pullup ticket #5525 - requested by taca
databases/mysql56-client: security update
databases/mysql56-server: security update

Revisions pulled up:
- databases/mysql55-client/Makefile                             1.25
- databases/mysql55-client/Makefile.common                      1.41
- databases/mysql55-client/distinfo                             1.43
- databases/mysql55-server/Makefile                             1.33
- databases/mysql55-server/PLIST                                1.30

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Wed Jul 19 18:48:22 UTC 2017

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

   Log Message:
   Security Notes
   * Security Fix: The linked OpenSSL library for the MySQL Commercial Server has been updated to version 1.0.2l. Issues fixed in the new OpenSSL version are described at http://www.openssl.org/news/vulnerabilities.html.
     This change does not affect the Oracle-produced MySQL Community build of MySQL Server, which uses the yaSSL library instead.

   Platform-Specific Notes
   * Linux: The generic Linux build for MySQL 5.6 is now built on Oracle Linux 6 using glibc 2.12. Systems that use the build need to have glibc 2.12 or later installed on them.

   Functionality Added or Changed
   * For Windows, MSI installer packages now include a check for the required Visual Studio redistributable package, and produce a message asking the user to install it if it is missing.
   * The mysql client now supports a --binary-as-hex option that causes display of binary data using hexadecimal notation (0xvalue). Thanks to Dani�l van Eeden for the patch.
   * mysqlaccess now looks for its configuration file only in the SYSCONFDIR directory and /etc.

   Bugs Fixed
   * InnoDB: The server allocated memory unnecessarily for an operation that rebuilt the table.
   * InnoDB: When using an index merge optimizer switch, a SELECT COUNT(*) operation sometimes returned 0. Partitioning code incorrectly performed a memcpy instead of a column copy of columns read by the index, causing the wrong records to be copied.
   * Replication: A USE statement that followed a SET GTID_NEXT statement sometimes had no effect.
   * Replication: If the binary log on a master server was rotated and a full disk condition occurred on the partition where the binary log file was being stored, the server could stop unexpectedly. The fix adds a check for the existence of the binary log when the dump thread switches to next binary log file. If the binary log is disabled, all binary logs up to the current active log are transmitted to slave and an error is returned to the receiver thread.
   * Replication: If a relay log index file named relay log files that did not exist, RESET SLAVE ALL sometimes did not fully clean up properly.
   * Replication: mysqlbinlog, if invoked with the --raw option, does not flush the output file until the process terminates. But if also invoked with the --stop-never option, the process never terminates, thus nothing is ever written to the output file. Now the output is flushed after each event.
   * Replication: A memory leak in mysqlbinlog was fixed. The leak happened when processing fake rotate events, or when using --raw and the destination log file could not be created. The leak only occurred when processing events from a remote server. Thanks to Laurynas Biveinis for his contribution to fixing this bug.
   * Replication: Multi-threaded slaves could not be configured with small queue sizes using slave_pending_jobs_size_max if they ever needed to process transactions larger than that size. Any packet larger than slave_pending_jobs_size_max was rejected with the error ER_MTS_EVENT_BIGGER_PENDING_JOBS_SIZE_MAX, even if the packet was smaller than the limit set by slave_max_allowed_packet.
   * With this fix, slave_pending_jobs_size_max becomes a soft limit rather than a hard limit. If the size of a packet exceeds slave_pending_jobs_size_max but is less than slave_max_allowed_packet, the transaction is held until all the slave workers have empty queues, and then processed. All subsequent transactions are held until the large transaction has been completed. The queue size for slave workers can therefore be limited while still allowing occasional larger transactions.
   * mysqldump could write database names in USE statements incorrectly.
   * If the mysql_stmt_close() C API function was called, it freed memory that later could be accessed if mysql_stmt_error(), mysql_stmt_errno(), or mysql_stmt_sqlstate() was called. To obtain error information after a call to mysql_stmt_close(), call mysql_error(), mysql_errno(), or mysql_sqlstate() instead.
   * Queries could be cached incorrectly, leading to incorrect query results, under these circumstances: InnoDB table; rows are being inserted but have not yet been committed; a query uses the table as a base table in a derived table; the optimizer chooses to materialize the derived table.
   * Man pages for a few utilities were missing from Debian/Ubuntu packages.
   * The field-t unit test failed to run with AddressSanitizer enabled. Thanks to Laurynas Biveinis for the patch.
   * Debian client packages were missing information about conflicts with native packages.
   * The Perl path in #! lines at the beginning of Perl scripts has been adjusted to /usr/local/bin/perl for FreeBSD 11.
   * The server exited abnormally attempting to access invalid memory.
   * A race condition could occur for CREATE TABLE statements with DATA DIRECTORY or INDEX DIRECTORY clauses.
   * MySQL compilation in different directories produced different builds to leakage of absolute paths into debug information and __FILE__.
   * mysqld_failed to start the server if the --datadir option was specified with a relative path name.
   * With read_only enabled, creation of non-TEMPORARY tables by non-SUPER users was permitted under certain conditions.
   *Certain stored functions, if used in a query WHERE clause, could be handled using Index Condition Pushdown (which should not happen), resulting in a server exit.
   * On x86 machines, the uint3korr() macro read 4 bytes of data instead of the intended 3 bytes.
   * An assertion was raised during a fetch operation by the memcached plugin.
   * Queries that contained UNION in a subquery and GROUP BY could return incorrect results.
   * LOAD XML INFILE performance became noticeably slower when the XML file being read contained a great many spaces, such as those introduced by indenting or pretty-printing. Now all leading whitespace is trimmed from each such value before reading it into memory.

   To generate a diff of this commit:

   cvs rdiff -u -r1.24 -r1.25 pkgsrc/databases/mysql56-client/Makefile
   cvs rdiff -u -r1.40 -r1.41 pkgsrc/databases/mysql56-client/Makefile.common
   cvs rdiff -u -r1.42 -r1.43 pkgsrc/databases/mysql56-client/distinfo
   cvs rdiff -u -r1.32 -r1.33 pkgsrc/databases/mysql56-server/Makefile
   cvs rdiff -u -r1.29 -r1.30 pkgsrc/databases/mysql56-server/PLIST


(spz)
diff -r1.24 -r1.24.8.1 pkgsrc/databases/mysql56-client/Makefile
diff -r1.40 -r1.40.2.1 pkgsrc/databases/mysql56-client/Makefile.common
diff -r1.42 -r1.42.2.1 pkgsrc/databases/mysql56-client/distinfo
diff -r1.32 -r1.32.2.1 pkgsrc/databases/mysql56-server/Makefile
diff -r1.29 -r1.29.2.1 pkgsrc/databases/mysql56-server/PLIST

cvs diff -r1.24 -r1.24.8.1 pkgsrc/databases/mysql56-client/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-client/Makefile 2016/08/04 10:09:08 1.24
+++ pkgsrc/databases/mysql56-client/Makefile 2017/07/29 20:10:58 1.24.8.1
@@ -1,38 +1,42 @@ @@ -1,38 +1,42 @@
1# $NetBSD: Makefile,v 1.24 2016/08/04 10:09:08 adam Exp $ 1# $NetBSD: Makefile,v 1.24.8.1 2017/07/29 20:10:58 spz Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-client-/} 3PKGNAME= ${DISTNAME:S/-/-client-/}
4COMMENT= MySQL 5, a free SQL database (client) 4COMMENT= MySQL 5, a free SQL database (client)
5 5
6CONFLICTS= mysql3-client-[0-9]* 6CONFLICTS= mysql3-client-[0-9]*
7 7
8.include "Makefile.common" 8.include "Makefile.common"
9 9
10CMAKE_ARGS+= -DWITHOUT_SERVER=ON 10CMAKE_ARGS+= -DWITHOUT_SERVER=ON
11UNWRAP_FILES+= scripts/mysql_config 11UNWRAP_FILES+= scripts/mysql_config
12INFO_FILES= yes 12INFO_FILES= yes
13INSTALL_DIRS+= client include libmysql man scripts tests 13INSTALL_DIRS+= client include libmysql man scripts tests
14 14
15REPLACE_PERL= scripts/mysql_convert_table_format.sh 15SUBST_CLASSES+= perlpath
16REPLACE_PERL+= scripts/mysql_find_rows.sh 16SUBST_STAGE.perlpath= pre-configure
17REPLACE_PERL+= scripts/mysql_fix_extensions.sh 17SUBST_MESSAGE.perlpath= Fixing Perl paths.
18REPLACE_PERL+= scripts/mysql_install_db.pl.in 18SUBST_FILES.perlpath= scripts/mysql_convert_table_format.sh
19REPLACE_PERL+= scripts/mysql_secure_installation.pl.in 19SUBST_FILES.perlpath+= scripts/mysql_find_rows.sh
20REPLACE_PERL+= scripts/mysql_setpermission.sh 20SUBST_FILES.perlpath+= scripts/mysql_fix_extensions.sh
21REPLACE_PERL+= scripts/mysql_zap.sh 21SUBST_FILES.perlpath+= scripts/mysql_install_db.pl.in
22REPLACE_PERL+= scripts/mysqlaccess.sh 22SUBST_FILES.perlpath+= scripts/mysql_secure_installation.pl.in
23REPLACE_PERL+= scripts/mysqld_multi.sh 23SUBST_FILES.perlpath+= scripts/mysql_setpermission.sh
24REPLACE_PERL+= scripts/mysqldumpslow.sh 24SUBST_FILES.perlpath+= scripts/mysql_zap.sh
25REPLACE_PERL+= scripts/mysqlhotcopy.sh 25SUBST_FILES.perlpath+= scripts/mysqlaccess.sh
 26SUBST_FILES.perlpath+= scripts/mysqld_multi.sh
 27SUBST_FILES.perlpath+= scripts/mysqldumpslow.sh
 28SUBST_FILES.perlpath+= scripts/mysqlhotcopy.sh
 29SUBST_SED.perlpath= -e 's,@PERL_PATH@,${PERL5},g'
26 30
27SUBST_CLASSES+= fixwrap 31SUBST_CLASSES+= fixwrap
28SUBST_STAGE.fixwrap= post-build 32SUBST_STAGE.fixwrap= post-build
29SUBST_FILES.fixwrap= scripts/mysqlbug 33SUBST_FILES.fixwrap= scripts/mysqlbug
30SUBST_SED.fixwrap= -e "s,${WRAPPER_BINDIR}/,,g" 34SUBST_SED.fixwrap= -e "s,${WRAPPER_BINDIR}/,,g"
31 35
32# Replace manual pages which only include other ones with a symbolic link 36# Replace manual pages which only include other ones with a symbolic link
33# It is for manual compression is activated or mandoc(1) is used. 37# It is for manual compression is activated or mandoc(1) is used.
34post-install: 38post-install:
35.for mf in mysql_client_test_embedded.1 mysqltest_embedded.1 39.for mf in mysql_client_test_embedded.1 mysqltest_embedded.1
36 ${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${mf} 40 ${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${mf}
37 ${LN} -s ${mf:S/_embedded//} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${mf} 41 ${LN} -s ${mf:S/_embedded//} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${mf}
38.endfor 42.endfor

cvs diff -r1.40 -r1.40.2.1 pkgsrc/databases/mysql56-client/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-client/Makefile.common 2017/05/05 16:22:29 1.40
+++ pkgsrc/databases/mysql56-client/Makefile.common 2017/07/29 20:10:58 1.40.2.1
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile.common,v 1.40 2017/05/05 16:22:29 jperkin Exp $ 1# $NetBSD: Makefile.common,v 1.40.2.1 2017/07/29 20:10:58 spz 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.36 6DISTNAME= mysql-5.6.37
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
@@ -93,31 +93,33 @@ CFLAGS.SunOS+= -DHAVE_CURSES_H @@ -93,31 +93,33 @@ CFLAGS.SunOS+= -DHAVE_CURSES_H
93CXXFLAGS.SunOS+= -DHAVE_CURSES_H 93CXXFLAGS.SunOS+= -DHAVE_CURSES_H
94 94
95.include "../../mk/pthread.buildlink3.mk" 95.include "../../mk/pthread.buildlink3.mk"
96 96
97.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") 97.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
98CFLAGS+= -DSIGNALS_DONT_BREAK_READ 98CFLAGS+= -DSIGNALS_DONT_BREAK_READ
99CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ 99CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ
100.endif 100.endif
101 101
102LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql 102LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
103 103
104SUBST_CLASSES+= scr 104SUBST_CLASSES+= scr
105SUBST_STAGE.scr= pre-configure 105SUBST_STAGE.scr= pre-configure
106SUBST_FILES.scr= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \ 106SUBST_FILES.scr= scripts/mysql_install_db.sh
107 scripts/mysql_secure_installation.sh \ 107SUBST_FILES.scr+= scripts/mysql_secure_installation.sh
108 support-files/mysql.server.sh 108SUBST_FILES.scr+= scripts/mysqld_safe.sh
 109SUBST_FILES.scr+= support-files/mysql.server.sh
109SUBST_SED.scr= -e "s,chown,${CHOWN},g" 110SUBST_SED.scr= -e "s,chown,${CHOWN},g"
110SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g" 111SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
 112SUBST_SED.scr+= -e "s,@SHELL_PATH@,${RCD_SCRIPTS_SHELL},g"
111SUBST_MESSAGE.scr= Fixing scripts. 113SUBST_MESSAGE.scr= Fixing scripts.
112 114
113SUBST_CLASSES+= fixpaths 115SUBST_CLASSES+= fixpaths
114SUBST_STAGE.fixpaths= post-install 116SUBST_STAGE.fixpaths= post-install
115SUBST_FILES.fixpaths= ${DESTDIR}${PREFIX}/bin/mysqlbug 117SUBST_FILES.fixpaths= ${DESTDIR}${PREFIX}/bin/mysqlbug
116SUBST_FILES.fixpaths+= ${DESTDIR}${PREFIX}/share/doc/mysql/INFO_BIN 118SUBST_FILES.fixpaths+= ${DESTDIR}${PREFIX}/share/doc/mysql/INFO_BIN
117SUBST_SED.fixpaths= -e "s,${WRAPPER_BINDIR}/gcc,${CCPATH},g" 119SUBST_SED.fixpaths= -e "s,${WRAPPER_BINDIR}/gcc,${CCPATH},g"
118SUBST_SED.fixpaths+= -e "s,${WRAPPER_BINDIR}/g++,${CXXPATH},g" 120SUBST_SED.fixpaths+= -e "s,${WRAPPER_BINDIR}/g++,${CXXPATH},g"
119 121
120# Don't use the base system "libedit" under NetBSD because MySQL expects 122# Don't use the base system "libedit" under NetBSD because MySQL expects
121# an incompatible prototype for "rl_completion_entry_function". 123# an incompatible prototype for "rl_completion_entry_function".
122.if ${OPSYS} == "NetBSD" 124.if ${OPSYS} == "NetBSD"
123USE_BUILTIN.editline= no 125USE_BUILTIN.editline= no

cvs diff -r1.42 -r1.42.2.1 pkgsrc/databases/mysql56-client/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-client/distinfo 2017/04/11 20:21:02 1.42
+++ pkgsrc/databases/mysql56-client/distinfo 2017/07/29 20:10:58 1.42.2.1
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.42 2017/04/11 20:21:02 adam Exp $ 1$NetBSD: distinfo,v 1.42.2.1 2017/07/29 20:10:58 spz Exp $
2 2
3SHA1 (mysql-5.6.36.tar.gz) = 6a94c75880c249cb2ec832bfcd3786944b0e7df5 3SHA1 (mysql-5.6.37.tar.gz) = 052d315488831cd1dfd150e938f8d6812ef28b7b
4RMD160 (mysql-5.6.36.tar.gz) = 9e02b6607e7d855db6afee2f80505d29dfcd454b 4RMD160 (mysql-5.6.37.tar.gz) = 4e168abdbc821ac7c8439dd592de616f6752cc3a
5SHA512 (mysql-5.6.36.tar.gz) = b3e3bcb1d1e913994f274f4c6dc72c77f1f52b132389e784c675d1720b5913788ce035f045b99ef3754d1b257db55e8300b5c7622ec79c33afafec5968801c18 5SHA512 (mysql-5.6.37.tar.gz) = 6935cf11490fb32832468e2a69a9d81a567b1b4ab0afaa0614896e3ddbb95a74b26406284f307637e4b2b9620ef4d96a167128ce7fcb1d338b0ebbc2cef2e597
6Size (mysql-5.6.36.tar.gz) = 32192348 bytes 6Size (mysql-5.6.37.tar.gz) = 32200158 bytes
7SHA1 (sphinx-2.2.11-release.tar.gz) = 34e83f43de0e69e258bf749ea00348c60a51632a 7SHA1 (sphinx-2.2.11-release.tar.gz) = 34e83f43de0e69e258bf749ea00348c60a51632a
8RMD160 (sphinx-2.2.11-release.tar.gz) = 5804b4cce64bc03fa20bac26c7391cd661cecc77 8RMD160 (sphinx-2.2.11-release.tar.gz) = 5804b4cce64bc03fa20bac26c7391cd661cecc77
9SHA512 (sphinx-2.2.11-release.tar.gz) = cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689 9SHA512 (sphinx-2.2.11-release.tar.gz) = cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
10Size (sphinx-2.2.11-release.tar.gz) = 3061998 bytes 10Size (sphinx-2.2.11-release.tar.gz) = 3061998 bytes
11SHA1 (patch-CMakeLists.txt) = cc14caabcb6ca55eba33595f98ad4b3db14504da 11SHA1 (patch-CMakeLists.txt) = cc14caabcb6ca55eba33595f98ad4b3db14504da
12SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb 12SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
13SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93 13SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
14SHA1 (patch-client_sql_string.h) = f26aff4ce4cf6dfef44c85ef95120331ca8fef52 14SHA1 (patch-client_sql_string.h) = f26aff4ce4cf6dfef44c85ef95120331ca8fef52
15SHA1 (patch-cmake_dtrace.cmake) = d953fdf976f3a7e7f0c2c16a9a2d2615f2777396 15SHA1 (patch-cmake_dtrace.cmake) = d953fdf976f3a7e7f0c2c16a9a2d2615f2777396
16SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356 16SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356
17SHA1 (patch-cmake_os_SunOS.cmake) = 60ba9f81c28bbb78295b8a12fe6cd3b176c03f91 17SHA1 (patch-cmake_os_SunOS.cmake) = 60ba9f81c28bbb78295b8a12fe6cd3b176c03f91
18SHA1 (patch-cmake_plugin.cmake) = 03e7a7debd61e870bd76d5c5b253a620662b3595 18SHA1 (patch-cmake_plugin.cmake) = 03e7a7debd61e870bd76d5c5b253a620662b3595
19SHA1 (patch-cmake_readline.cmake) = 6bec6ca87b45c739d0614493477a18bb7c56d981 19SHA1 (patch-cmake_readline.cmake) = 6bec6ca87b45c739d0614493477a18bb7c56d981

cvs diff -r1.32 -r1.32.2.1 pkgsrc/databases/mysql56-server/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-server/Makefile 2017/06/24 15:18:42 1.32
+++ pkgsrc/databases/mysql56-server/Makefile 2017/07/29 20:10:58 1.32.2.1
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.32 2017/06/24 15:18:42 schmonz Exp $ 1# $NetBSD: Makefile,v 1.32.2.1 2017/07/29 20:10:58 spz Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-server-/} 3PKGNAME= ${DISTNAME:S/-/-server-/}
4PKGREVISION= 1 
5COMMENT= MySQL 5, a free SQL database (server) 4COMMENT= MySQL 5, a free SQL database (server)
6 5
7CONFLICTS= mysql3-server-[0-9]* 6CONFLICTS= mysql3-server-[0-9]*
8 7
9.include "../../databases/mysql56-client/Makefile.common" 8.include "../../databases/mysql56-client/Makefile.common"
10 9
11CMAKE_ARGS+= -DWITH_LIBWRAP=ON 10CMAKE_ARGS+= -DWITH_LIBWRAP=ON
12CMAKE_ARGS+= -DINSTALL_INFODIR=${PKGINFODIR} 11CMAKE_ARGS+= -DINSTALL_INFODIR=${PKGINFODIR}
13 12
14.if !empty(PKG_OPTIONS:Membedded-server) 13.if !empty(PKG_OPTIONS:Membedded-server)
15CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON 14CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON
16PLIST.embedded= yes 15PLIST.embedded= yes
17.else 16.else

cvs diff -r1.29 -r1.29.2.1 pkgsrc/databases/mysql56-server/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-server/PLIST 2017/04/11 20:21:02 1.29
+++ pkgsrc/databases/mysql56-server/PLIST 2017/07/29 20:10:58 1.29.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.29 2017/04/11 20:21:02 adam Exp $ 1@comment $NetBSD: PLIST,v 1.29.2.1 2017/07/29 20:10:58 spz 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
@@ -274,26 +274,27 @@ share/mysql/test/extra/rpl_tests/rpl_ins @@ -274,26 +274,27 @@ share/mysql/test/extra/rpl_tests/rpl_ins
274share/mysql/test/extra/rpl_tests/rpl_insert_ignore_gtid_on.inc 274share/mysql/test/extra/rpl_tests/rpl_insert_ignore_gtid_on.inc
275share/mysql/test/extra/rpl_tests/rpl_kill_query.inc 275share/mysql/test/extra/rpl_tests/rpl_kill_query.inc
276share/mysql/test/extra/rpl_tests/rpl_loaddata.test 276share/mysql/test/extra/rpl_tests/rpl_loaddata.test
277share/mysql/test/extra/rpl_tests/rpl_loaddata_s.inc 277share/mysql/test/extra/rpl_tests/rpl_loaddata_s.inc
278share/mysql/test/extra/rpl_tests/rpl_loadfile.test 278share/mysql/test/extra/rpl_tests/rpl_loadfile.test
279share/mysql/test/extra/rpl_tests/rpl_log.test 279share/mysql/test/extra/rpl_tests/rpl_log.test
280share/mysql/test/extra/rpl_tests/rpl_lower_case_table_names.test 280share/mysql/test/extra/rpl_tests/rpl_lower_case_table_names.test
281share/mysql/test/extra/rpl_tests/rpl_max_relay_size.test 281share/mysql/test/extra/rpl_tests/rpl_max_relay_size.test
282share/mysql/test/extra/rpl_tests/rpl_mixing_engines.inc 282share/mysql/test/extra/rpl_tests/rpl_mixing_engines.inc
283share/mysql/test/extra/rpl_tests/rpl_mixing_engines.test 283share/mysql/test/extra/rpl_tests/rpl_mixing_engines.test
284share/mysql/test/extra/rpl_tests/rpl_mts_crash_safe.inc 284share/mysql/test/extra/rpl_tests/rpl_mts_crash_safe.inc
285share/mysql/test/extra/rpl_tests/rpl_mts_crash_safe.test 285share/mysql/test/extra/rpl_tests/rpl_mts_crash_safe.test
286share/mysql/test/extra/rpl_tests/rpl_mts_execute_partial_trx_in_relay_log.inc 286share/mysql/test/extra/rpl_tests/rpl_mts_execute_partial_trx_in_relay_log.inc
 287share/mysql/test/extra/rpl_tests/rpl_mts_pending_events.inc
287share/mysql/test/extra/rpl_tests/rpl_mts_relay_log_recovery.test 288share/mysql/test/extra/rpl_tests/rpl_mts_relay_log_recovery.test
288share/mysql/test/extra/rpl_tests/rpl_multi_query.test 289share/mysql/test/extra/rpl_tests/rpl_multi_query.test
289share/mysql/test/extra/rpl_tests/rpl_multi_update.test 290share/mysql/test/extra/rpl_tests/rpl_multi_update.test
290share/mysql/test/extra/rpl_tests/rpl_multi_update2.test 291share/mysql/test/extra/rpl_tests/rpl_multi_update2.test
291share/mysql/test/extra/rpl_tests/rpl_multi_update3.test 292share/mysql/test/extra/rpl_tests/rpl_multi_update3.test
292share/mysql/test/extra/rpl_tests/rpl_not_null.test 293share/mysql/test/extra/rpl_tests/rpl_not_null.test
293share/mysql/test/extra/rpl_tests/rpl_parallel_load.test 294share/mysql/test/extra/rpl_tests/rpl_parallel_load.test
294share/mysql/test/extra/rpl_tests/rpl_parallel_load_innodb.test 295share/mysql/test/extra/rpl_tests/rpl_parallel_load_innodb.test
295share/mysql/test/extra/rpl_tests/rpl_partition.test 296share/mysql/test/extra/rpl_tests/rpl_partition.test
296share/mysql/test/extra/rpl_tests/rpl_record_compare.test 297share/mysql/test/extra/rpl_tests/rpl_record_compare.test
297share/mysql/test/extra/rpl_tests/rpl_relayrotate.test 298share/mysql/test/extra/rpl_tests/rpl_relayrotate.test
298share/mysql/test/extra/rpl_tests/rpl_reset_slave.test 299share/mysql/test/extra/rpl_tests/rpl_reset_slave.test
299share/mysql/test/extra/rpl_tests/rpl_rollback_to_savepoint.inc 300share/mysql/test/extra/rpl_tests/rpl_rollback_to_savepoint.inc
@@ -858,26 +859,27 @@ share/mysql/test/r/archive_bitfield.resu @@ -858,26 +859,27 @@ share/mysql/test/r/archive_bitfield.resu
858share/mysql/test/r/archive_debug.result 859share/mysql/test/r/archive_debug.result
859share/mysql/test/r/archive_gis.result 860share/mysql/test/r/archive_gis.result
860share/mysql/test/r/archive_no_symlink.result 861share/mysql/test/r/archive_no_symlink.result
861share/mysql/test/r/archive_plugin.result 862share/mysql/test/r/archive_plugin.result
862share/mysql/test/r/archive_symlink.result 863share/mysql/test/r/archive_symlink.result
863share/mysql/test/r/audit_plugin.result 864share/mysql/test/r/audit_plugin.result
864share/mysql/test/r/auth_rpl.result 865share/mysql/test/r/auth_rpl.result
865share/mysql/test/r/auto_increment.result 866share/mysql/test/r/auto_increment.result
866share/mysql/test/r/backup.result 867share/mysql/test/r/backup.result
867share/mysql/test/r/bench_count_distinct.result 868share/mysql/test/r/bench_count_distinct.result
868share/mysql/test/r/big_test.require 869share/mysql/test/r/big_test.require
869share/mysql/test/r/bigint.result 870share/mysql/test/r/bigint.result
870share/mysql/test/r/binary.result 871share/mysql/test/r/binary.result
 872share/mysql/test/r/binary_to_hex.result
871share/mysql/test/r/binlog_tx_isolation.result 873share/mysql/test/r/binlog_tx_isolation.result
872share/mysql/test/r/blackhole.result 874share/mysql/test/r/blackhole.result
873share/mysql/test/r/blackhole_plugin.result 875share/mysql/test/r/blackhole_plugin.result
874share/mysql/test/r/bool.result 876share/mysql/test/r/bool.result
875share/mysql/test/r/bootstrap.result 877share/mysql/test/r/bootstrap.result
876share/mysql/test/r/bug12427262.result 878share/mysql/test/r/bug12427262.result
877share/mysql/test/r/bug12969156.result 879share/mysql/test/r/bug12969156.result
878share/mysql/test/r/bug17076131.result 880share/mysql/test/r/bug17076131.result
879share/mysql/test/r/bug33509.result 881share/mysql/test/r/bug33509.result
880share/mysql/test/r/bug39022.result 882share/mysql/test/r/bug39022.result
881share/mysql/test/r/bug46080.result 883share/mysql/test/r/bug46080.result
882share/mysql/test/r/bug46261.result 884share/mysql/test/r/bug46261.result
883share/mysql/test/r/bug46760.result 885share/mysql/test/r/bug46760.result
@@ -1499,26 +1501,27 @@ share/mysql/test/r/select_icp_mrr.result @@ -1499,26 +1501,27 @@ share/mysql/test/r/select_icp_mrr.result
1499share/mysql/test/r/select_icp_mrr_bka.result 1501share/mysql/test/r/select_icp_mrr_bka.result
1500share/mysql/test/r/select_icp_mrr_bka_nixbnl.result 1502share/mysql/test/r/select_icp_mrr_bka_nixbnl.result
1501share/mysql/test/r/select_none.result 1503share/mysql/test/r/select_none.result
1502share/mysql/test/r/select_none_bka.result 1504share/mysql/test/r/select_none_bka.result
1503share/mysql/test/r/select_none_bka_nixbnl.result 1505share/mysql/test/r/select_none_bka_nixbnl.result
1504share/mysql/test/r/select_safe.result 1506share/mysql/test/r/select_safe.result
1505share/mysql/test/r/server_id.require 1507share/mysql/test/r/server_id.require
1506share/mysql/test/r/server_id1.require 1508share/mysql/test/r/server_id1.require
1507share/mysql/test/r/server_uuid.result 1509share/mysql/test/r/server_uuid.result
1508share/mysql/test/r/server_uuid_embedded.result 1510share/mysql/test/r/server_uuid_embedded.result
1509share/mysql/test/r/shm.result 1511share/mysql/test/r/shm.result
1510share/mysql/test/r/show_check.result 1512share/mysql/test/r/show_check.result
1511share/mysql/test/r/show_processlist.result 1513share/mysql/test/r/show_processlist.result
 1514share/mysql/test/r/show_processlist_state.result
1512share/mysql/test/r/show_profile.result 1515share/mysql/test/r/show_profile.result
1513share/mysql/test/r/signal.result 1516share/mysql/test/r/signal.result
1514share/mysql/test/r/signal_code.result 1517share/mysql/test/r/signal_code.result
1515share/mysql/test/r/signal_demo1.result 1518share/mysql/test/r/signal_demo1.result
1516share/mysql/test/r/signal_demo2.result 1519share/mysql/test/r/signal_demo2.result
1517share/mysql/test/r/signal_demo3.result 1520share/mysql/test/r/signal_demo3.result
1518share/mysql/test/r/signal_sqlmode.result 1521share/mysql/test/r/signal_sqlmode.result
1519share/mysql/test/r/single_delete_update.result 1522share/mysql/test/r/single_delete_update.result
1520share/mysql/test/r/skip_grants.result 1523share/mysql/test/r/skip_grants.result
1521share/mysql/test/r/skip_log_bin.result 1524share/mysql/test/r/skip_log_bin.result
1522share/mysql/test/r/skip_name_resolve.result 1525share/mysql/test/r/skip_name_resolve.result
1523share/mysql/test/r/slave-running.result 1526share/mysql/test/r/slave-running.result
1524share/mysql/test/r/slave-stopped.result 1527share/mysql/test/r/slave-stopped.result
@@ -1969,26 +1972,27 @@ share/mysql/test/suite/binlog/r/binlog_i @@ -1969,26 +1972,27 @@ share/mysql/test/suite/binlog/r/binlog_i
1969share/mysql/test/suite/binlog/r/binlog_index.result 1972share/mysql/test/suite/binlog/r/binlog_index.result
1970share/mysql/test/suite/binlog/r/binlog_innodb.result 1973share/mysql/test/suite/binlog/r/binlog_innodb.result
1971share/mysql/test/suite/binlog/r/binlog_innodb_row.result 1974share/mysql/test/suite/binlog/r/binlog_innodb_row.result
1972share/mysql/test/suite/binlog/r/binlog_killed.result 1975share/mysql/test/suite/binlog/r/binlog_killed.result
1973share/mysql/test/suite/binlog/r/binlog_killed_simulate.result 1976share/mysql/test/suite/binlog/r/binlog_killed_simulate.result
1974share/mysql/test/suite/binlog/r/binlog_max_extension.result 1977share/mysql/test/suite/binlog/r/binlog_max_extension.result
1975share/mysql/test/suite/binlog/r/binlog_mixed_cache_stat.result 1978share/mysql/test/suite/binlog/r/binlog_mixed_cache_stat.result
1976share/mysql/test/suite/binlog/r/binlog_mixed_load_data.result 1979share/mysql/test/suite/binlog/r/binlog_mixed_load_data.result
1977share/mysql/test/suite/binlog/r/binlog_multi_engine.result 1980share/mysql/test/suite/binlog/r/binlog_multi_engine.result
1978share/mysql/test/suite/binlog/r/binlog_mysqlbinlog-cp932.result 1981share/mysql/test/suite/binlog/r/binlog_mysqlbinlog-cp932.result
1979share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_base64.result 1982share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_base64.result
1980share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_concat.result 1983share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_concat.result
1981share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_filter.result 1984share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_filter.result
 1985share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_raw.result
1982share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_row.result 1986share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_row.result
1983share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result 1987share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result
1984share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result 1988share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result
1985share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result 1989share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result
1986share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_start_stop.result 1990share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_start_stop.result
1987share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_start_stop_slave_server_id.result 1991share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_start_stop_slave_server_id.result
1988share/mysql/test/suite/binlog/r/binlog_old_versions.result 1992share/mysql/test/suite/binlog/r/binlog_old_versions.result
1989share/mysql/test/suite/binlog/r/binlog_query_filter_rules.result 1993share/mysql/test/suite/binlog/r/binlog_query_filter_rules.result
1990share/mysql/test/suite/binlog/r/binlog_reset_master.result 1994share/mysql/test/suite/binlog/r/binlog_reset_master.result
1991share/mysql/test/suite/binlog/r/binlog_rewrite.result 1995share/mysql/test/suite/binlog/r/binlog_rewrite.result
1992share/mysql/test/suite/binlog/r/binlog_rotate_bgc_sync.result 1996share/mysql/test/suite/binlog/r/binlog_rotate_bgc_sync.result
1993share/mysql/test/suite/binlog/r/binlog_row_binlog.result 1997share/mysql/test/suite/binlog/r/binlog_row_binlog.result
1994share/mysql/test/suite/binlog/r/binlog_row_cache_stat.result 1998share/mysql/test/suite/binlog/r/binlog_row_cache_stat.result
@@ -2018,26 +2022,27 @@ share/mysql/test/suite/binlog/r/binlog_s @@ -2018,26 +2022,27 @@ share/mysql/test/suite/binlog/r/binlog_s
2018share/mysql/test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result 2022share/mysql/test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result
2019share/mysql/test/suite/binlog/r/binlog_stm_insert_select.result 2023share/mysql/test/suite/binlog/r/binlog_stm_insert_select.result
2020share/mysql/test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result 2024share/mysql/test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
2021share/mysql/test/suite/binlog/r/binlog_stm_ps.result 2025share/mysql/test/suite/binlog/r/binlog_stm_ps.result
2022share/mysql/test/suite/binlog/r/binlog_stm_row.result 2026share/mysql/test/suite/binlog/r/binlog_stm_row.result
2023share/mysql/test/suite/binlog/r/binlog_stm_unsafe_warning.result 2027share/mysql/test/suite/binlog/r/binlog_stm_unsafe_warning.result
2024share/mysql/test/suite/binlog/r/binlog_stm_user_variables.result 2028share/mysql/test/suite/binlog/r/binlog_stm_user_variables.result
2025share/mysql/test/suite/binlog/r/binlog_switch_inside_trans.result 2029share/mysql/test/suite/binlog/r/binlog_switch_inside_trans.result
2026share/mysql/test/suite/binlog/r/binlog_tmp_table.result 2030share/mysql/test/suite/binlog/r/binlog_tmp_table.result
2027share/mysql/test/suite/binlog/r/binlog_truncate_kill.result 2031share/mysql/test/suite/binlog/r/binlog_truncate_kill.result
2028share/mysql/test/suite/binlog/r/binlog_truncate_myisam.result 2032share/mysql/test/suite/binlog/r/binlog_truncate_myisam.result
2029share/mysql/test/suite/binlog/r/binlog_trx_empty_assertions.result 2033share/mysql/test/suite/binlog/r/binlog_trx_empty_assertions.result
2030share/mysql/test/suite/binlog/r/binlog_unsafe.result 2034share/mysql/test/suite/binlog/r/binlog_unsafe.result
 2035share/mysql/test/suite/binlog/r/binlog_use_gtid_skip.result
2031share/mysql/test/suite/binlog/r/binlog_variables_log_bin.result 2036share/mysql/test/suite/binlog/r/binlog_variables_log_bin.result
2032share/mysql/test/suite/binlog/r/binlog_variables_log_bin_index.result 2037share/mysql/test/suite/binlog/r/binlog_variables_log_bin_index.result
2033share/mysql/test/suite/binlog/r/binlog_variables_relay_log.result 2038share/mysql/test/suite/binlog/r/binlog_variables_relay_log.result
2034share/mysql/test/suite/binlog/r/binlog_variables_relay_log_index.result 2039share/mysql/test/suite/binlog/r/binlog_variables_relay_log_index.result
2035share/mysql/test/suite/binlog/r/binlog_write_error.result 2040share/mysql/test/suite/binlog/r/binlog_write_error.result
2036share/mysql/test/suite/binlog/r/binlog_xa_handling.result 2041share/mysql/test/suite/binlog/r/binlog_xa_handling.result
2037share/mysql/test/suite/binlog/r/show_binlog_events_no_lock.result 2042share/mysql/test/suite/binlog/r/show_binlog_events_no_lock.result
2038share/mysql/test/suite/binlog/std_data/binlog_old_version_4_1.000001 2043share/mysql/test/suite/binlog/std_data/binlog_old_version_4_1.000001
2039share/mysql/test/suite/binlog/std_data/bug11747887-bin.000003 2044share/mysql/test/suite/binlog/std_data/bug11747887-bin.000003
2040share/mysql/test/suite/binlog/std_data/bug32407.001 2045share/mysql/test/suite/binlog/std_data/bug32407.001
2041share/mysql/test/suite/binlog/std_data/update-full-row.binlog 2046share/mysql/test/suite/binlog/std_data/update-full-row.binlog
2042share/mysql/test/suite/binlog/std_data/update-partial-row.binlog 2047share/mysql/test/suite/binlog/std_data/update-partial-row.binlog
2043share/mysql/test/suite/binlog/std_data/ver_5_1-telco.001 2048share/mysql/test/suite/binlog/std_data/ver_5_1-telco.001
@@ -2092,26 +2097,27 @@ share/mysql/test/suite/binlog/t/binlog_i @@ -2092,26 +2097,27 @@ share/mysql/test/suite/binlog/t/binlog_i
2092share/mysql/test/suite/binlog/t/binlog_innodb_row.test 2097share/mysql/test/suite/binlog/t/binlog_innodb_row.test
2093share/mysql/test/suite/binlog/t/binlog_killed.test 2098share/mysql/test/suite/binlog/t/binlog_killed.test
2094share/mysql/test/suite/binlog/t/binlog_killed_simulate-master.opt 2099share/mysql/test/suite/binlog/t/binlog_killed_simulate-master.opt
2095share/mysql/test/suite/binlog/t/binlog_killed_simulate.test 2100share/mysql/test/suite/binlog/t/binlog_killed_simulate.test
2096share/mysql/test/suite/binlog/t/binlog_max_extension.test 2101share/mysql/test/suite/binlog/t/binlog_max_extension.test
2097share/mysql/test/suite/binlog/t/binlog_mixed_cache_stat.test 2102share/mysql/test/suite/binlog/t/binlog_mixed_cache_stat.test
2098share/mysql/test/suite/binlog/t/binlog_mixed_load_data.test 2103share/mysql/test/suite/binlog/t/binlog_mixed_load_data.test
2099share/mysql/test/suite/binlog/t/binlog_multi_engine.test 2104share/mysql/test/suite/binlog/t/binlog_multi_engine.test
2100share/mysql/test/suite/binlog/t/binlog_mysqlbinlog-cp932-master.opt 2105share/mysql/test/suite/binlog/t/binlog_mysqlbinlog-cp932-master.opt
2101share/mysql/test/suite/binlog/t/binlog_mysqlbinlog-cp932.test 2106share/mysql/test/suite/binlog/t/binlog_mysqlbinlog-cp932.test
2102share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_base64.test 2107share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_base64.test
2103share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_concat.test 2108share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_concat.test
2104share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_filter.test 2109share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_filter.test
 2110share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_raw.test
2105share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_row.test 2111share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_row.test
2106share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test 2112share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test
2107share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_row_myisam.test 2113share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_row_myisam.test
2108share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_row_trans.test 2114share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_row_trans.test
2109share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_start_stop.test 2115share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_start_stop.test
2110share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_start_stop_slave_server_id.test 2116share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_start_stop_slave_server_id.test
2111share/mysql/test/suite/binlog/t/binlog_old_versions.test 2117share/mysql/test/suite/binlog/t/binlog_old_versions.test
2112share/mysql/test/suite/binlog/t/binlog_query_filter_rules-master.opt 2118share/mysql/test/suite/binlog/t/binlog_query_filter_rules-master.opt
2113share/mysql/test/suite/binlog/t/binlog_query_filter_rules.test 2119share/mysql/test/suite/binlog/t/binlog_query_filter_rules.test
2114share/mysql/test/suite/binlog/t/binlog_reset_master.test 2120share/mysql/test/suite/binlog/t/binlog_reset_master.test
2115share/mysql/test/suite/binlog/t/binlog_rewrite.test 2121share/mysql/test/suite/binlog/t/binlog_rewrite.test
2116share/mysql/test/suite/binlog/t/binlog_rotate_bgc_sync.test 2122share/mysql/test/suite/binlog/t/binlog_rotate_bgc_sync.test
2117share/mysql/test/suite/binlog/t/binlog_row_binlog-master.opt 2123share/mysql/test/suite/binlog/t/binlog_row_binlog-master.opt
@@ -2153,26 +2159,27 @@ share/mysql/test/suite/binlog/t/binlog_s @@ -2153,26 +2159,27 @@ share/mysql/test/suite/binlog/t/binlog_s
2153share/mysql/test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test 2159share/mysql/test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test
2154share/mysql/test/suite/binlog/t/binlog_stm_ps.test 2160share/mysql/test/suite/binlog/t/binlog_stm_ps.test
2155share/mysql/test/suite/binlog/t/binlog_stm_row.test 2161share/mysql/test/suite/binlog/t/binlog_stm_row.test
2156share/mysql/test/suite/binlog/t/binlog_stm_unsafe_warning-master.opt 2162share/mysql/test/suite/binlog/t/binlog_stm_unsafe_warning-master.opt
2157share/mysql/test/suite/binlog/t/binlog_stm_unsafe_warning.test 2163share/mysql/test/suite/binlog/t/binlog_stm_unsafe_warning.test
2158share/mysql/test/suite/binlog/t/binlog_stm_user_variables.test 2164share/mysql/test/suite/binlog/t/binlog_stm_user_variables.test
2159share/mysql/test/suite/binlog/t/binlog_switch_inside_trans.test 2165share/mysql/test/suite/binlog/t/binlog_switch_inside_trans.test
2160share/mysql/test/suite/binlog/t/binlog_tmp_table.test 2166share/mysql/test/suite/binlog/t/binlog_tmp_table.test
2161share/mysql/test/suite/binlog/t/binlog_truncate_innodb-master.opt 2167share/mysql/test/suite/binlog/t/binlog_truncate_innodb-master.opt
2162share/mysql/test/suite/binlog/t/binlog_truncate_kill.test 2168share/mysql/test/suite/binlog/t/binlog_truncate_kill.test
2163share/mysql/test/suite/binlog/t/binlog_truncate_myisam.test 2169share/mysql/test/suite/binlog/t/binlog_truncate_myisam.test
2164share/mysql/test/suite/binlog/t/binlog_unsafe-master.opt 2170share/mysql/test/suite/binlog/t/binlog_unsafe-master.opt
2165share/mysql/test/suite/binlog/t/binlog_unsafe.test 2171share/mysql/test/suite/binlog/t/binlog_unsafe.test
 2172share/mysql/test/suite/binlog/t/binlog_use_gtid_skip.test
2166share/mysql/test/suite/binlog/t/binlog_variables_log_bin-master.opt 2173share/mysql/test/suite/binlog/t/binlog_variables_log_bin-master.opt
2167share/mysql/test/suite/binlog/t/binlog_variables_log_bin.test 2174share/mysql/test/suite/binlog/t/binlog_variables_log_bin.test
2168share/mysql/test/suite/binlog/t/binlog_variables_log_bin_index-master.opt 2175share/mysql/test/suite/binlog/t/binlog_variables_log_bin_index-master.opt
2169share/mysql/test/suite/binlog/t/binlog_variables_log_bin_index.test 2176share/mysql/test/suite/binlog/t/binlog_variables_log_bin_index.test
2170share/mysql/test/suite/binlog/t/binlog_variables_relay_log-master.opt 2177share/mysql/test/suite/binlog/t/binlog_variables_relay_log-master.opt
2171share/mysql/test/suite/binlog/t/binlog_variables_relay_log.test 2178share/mysql/test/suite/binlog/t/binlog_variables_relay_log.test
2172share/mysql/test/suite/binlog/t/binlog_variables_relay_log_index-master.opt 2179share/mysql/test/suite/binlog/t/binlog_variables_relay_log_index-master.opt
2173share/mysql/test/suite/binlog/t/binlog_variables_relay_log_index.test 2180share/mysql/test/suite/binlog/t/binlog_variables_relay_log_index.test
2174share/mysql/test/suite/binlog/t/binlog_write_error.test 2181share/mysql/test/suite/binlog/t/binlog_write_error.test
2175share/mysql/test/suite/binlog/t/binlog_xa_handling.test 2182share/mysql/test/suite/binlog/t/binlog_xa_handling.test
2176share/mysql/test/suite/binlog/t/disabled.def 2183share/mysql/test/suite/binlog/t/disabled.def
2177share/mysql/test/suite/binlog/t/show_binlog_events_no_lock.test 2184share/mysql/test/suite/binlog/t/show_binlog_events_no_lock.test
2178share/mysql/test/suite/connection_control/inc/check_connection_delay.inc 2185share/mysql/test/suite/connection_control/inc/check_connection_delay.inc
@@ -3641,26 +3648,27 @@ share/mysql/test/suite/innodb/r/innodb_b @@ -3641,26 +3648,27 @@ share/mysql/test/suite/innodb/r/innodb_b
3641share/mysql/test/suite/innodb/r/innodb_bug56716.result 3648share/mysql/test/suite/innodb/r/innodb_bug56716.result
3642share/mysql/test/suite/innodb/r/innodb_bug56947.result 3649share/mysql/test/suite/innodb/r/innodb_bug56947.result
3643share/mysql/test/suite/innodb/r/innodb_bug57252.result 3650share/mysql/test/suite/innodb/r/innodb_bug57252.result
3644share/mysql/test/suite/innodb/r/innodb_bug57255.result 3651share/mysql/test/suite/innodb/r/innodb_bug57255.result
3645share/mysql/test/suite/innodb/r/innodb_bug57904.result 3652share/mysql/test/suite/innodb/r/innodb_bug57904.result
3646share/mysql/test/suite/innodb/r/innodb_bug59307.result 3653share/mysql/test/suite/innodb/r/innodb_bug59307.result
3647share/mysql/test/suite/innodb/r/innodb_bug59410.result 3654share/mysql/test/suite/innodb/r/innodb_bug59410.result
3648share/mysql/test/suite/innodb/r/innodb_bug59641.result 3655share/mysql/test/suite/innodb/r/innodb_bug59641.result
3649share/mysql/test/suite/innodb/r/innodb_bug59733.result 3656share/mysql/test/suite/innodb/r/innodb_bug59733.result
3650share/mysql/test/suite/innodb/r/innodb_bug60049.result 3657share/mysql/test/suite/innodb/r/innodb_bug60049.result
3651share/mysql/test/suite/innodb/r/innodb_bug60196.result 3658share/mysql/test/suite/innodb/r/innodb_bug60196.result
3652share/mysql/test/suite/innodb/r/innodb_bug60229.result 3659share/mysql/test/suite/innodb/r/innodb_bug60229.result
3653share/mysql/test/suite/innodb/r/innodb_bug70867.result 3660share/mysql/test/suite/innodb/r/innodb_bug70867.result
 3661share/mysql/test/suite/innodb/r/innodb_copy_col_in_partition.result
3654share/mysql/test/suite/innodb/r/innodb_corrupt_bit.result 3662share/mysql/test/suite/innodb/r/innodb_corrupt_bit.result
3655share/mysql/test/suite/innodb/r/innodb_ctype_ldml.result 3663share/mysql/test/suite/innodb/r/innodb_ctype_ldml.result
3656share/mysql/test/suite/innodb/r/innodb_deadlock_with_autoinc.result 3664share/mysql/test/suite/innodb/r/innodb_deadlock_with_autoinc.result
3657share/mysql/test/suite/innodb/r/innodb_file_format.result 3665share/mysql/test/suite/innodb/r/innodb_file_format.result
3658share/mysql/test/suite/innodb/r/innodb_file_limit_check.result 3666share/mysql/test/suite/innodb/r/innodb_file_limit_check.result
3659share/mysql/test/suite/innodb/r/innodb_force_recovery.result 3667share/mysql/test/suite/innodb/r/innodb_force_recovery.result
3660share/mysql/test/suite/innodb/r/innodb_gis.result 3668share/mysql/test/suite/innodb/r/innodb_gis.result
3661share/mysql/test/suite/innodb/r/innodb_i_s_innodb_locks.result 3669share/mysql/test/suite/innodb/r/innodb_i_s_innodb_locks.result
3662share/mysql/test/suite/innodb/r/innodb_i_s_innodb_trx.result 3670share/mysql/test/suite/innodb/r/innodb_i_s_innodb_trx.result
3663share/mysql/test/suite/innodb/r/innodb_information_schema_buffer.result 3671share/mysql/test/suite/innodb/r/innodb_information_schema_buffer.result
3664share/mysql/test/suite/innodb/r/innodb_io_pf.result 3672share/mysql/test/suite/innodb/r/innodb_io_pf.result
3665share/mysql/test/suite/innodb/r/innodb_lock_wait_timeout_1.result 3673share/mysql/test/suite/innodb/r/innodb_lock_wait_timeout_1.result
3666share/mysql/test/suite/innodb/r/innodb_misc1.result 3674share/mysql/test/suite/innodb/r/innodb_misc1.result
@@ -3870,26 +3878,27 @@ share/mysql/test/suite/innodb/t/innodb_b @@ -3870,26 +3878,27 @@ share/mysql/test/suite/innodb/t/innodb_b
3870share/mysql/test/suite/innodb/t/innodb_bug57252.test 3878share/mysql/test/suite/innodb/t/innodb_bug57252.test
3871share/mysql/test/suite/innodb/t/innodb_bug57255.test 3879share/mysql/test/suite/innodb/t/innodb_bug57255.test
3872share/mysql/test/suite/innodb/t/innodb_bug57904.test 3880share/mysql/test/suite/innodb/t/innodb_bug57904.test
3873share/mysql/test/suite/innodb/t/innodb_bug59307.test 3881share/mysql/test/suite/innodb/t/innodb_bug59307.test
3874share/mysql/test/suite/innodb/t/innodb_bug59410.test 3882share/mysql/test/suite/innodb/t/innodb_bug59410.test
3875share/mysql/test/suite/innodb/t/innodb_bug59641.test 3883share/mysql/test/suite/innodb/t/innodb_bug59641.test
3876share/mysql/test/suite/innodb/t/innodb_bug59733.test 3884share/mysql/test/suite/innodb/t/innodb_bug59733.test
3877share/mysql/test/suite/innodb/t/innodb_bug60049-master.opt 3885share/mysql/test/suite/innodb/t/innodb_bug60049-master.opt
3878share/mysql/test/suite/innodb/t/innodb_bug60049.test 3886share/mysql/test/suite/innodb/t/innodb_bug60049.test
3879share/mysql/test/suite/innodb/t/innodb_bug60196-master.opt 3887share/mysql/test/suite/innodb/t/innodb_bug60196-master.opt
3880share/mysql/test/suite/innodb/t/innodb_bug60196.test 3888share/mysql/test/suite/innodb/t/innodb_bug60196.test
3881share/mysql/test/suite/innodb/t/innodb_bug60229.test 3889share/mysql/test/suite/innodb/t/innodb_bug60229.test
3882share/mysql/test/suite/innodb/t/innodb_bug70867.test 3890share/mysql/test/suite/innodb/t/innodb_bug70867.test
 3891share/mysql/test/suite/innodb/t/innodb_copy_col_in_partition.test
3883share/mysql/test/suite/innodb/t/innodb_corrupt_bit.test 3892share/mysql/test/suite/innodb/t/innodb_corrupt_bit.test
3884share/mysql/test/suite/innodb/t/innodb_ctype_ldml-master.opt 3893share/mysql/test/suite/innodb/t/innodb_ctype_ldml-master.opt
3885share/mysql/test/suite/innodb/t/innodb_ctype_ldml.test 3894share/mysql/test/suite/innodb/t/innodb_ctype_ldml.test
3886share/mysql/test/suite/innodb/t/innodb_deadlock_with_autoinc-master.opt 3895share/mysql/test/suite/innodb/t/innodb_deadlock_with_autoinc-master.opt
3887share/mysql/test/suite/innodb/t/innodb_deadlock_with_autoinc.test 3896share/mysql/test/suite/innodb/t/innodb_deadlock_with_autoinc.test
3888share/mysql/test/suite/innodb/t/innodb_file_format-master.opt 3897share/mysql/test/suite/innodb/t/innodb_file_format-master.opt
3889share/mysql/test/suite/innodb/t/innodb_file_format.test 3898share/mysql/test/suite/innodb/t/innodb_file_format.test
3890share/mysql/test/suite/innodb/t/innodb_file_limit_check-master.opt 3899share/mysql/test/suite/innodb/t/innodb_file_limit_check-master.opt
3891share/mysql/test/suite/innodb/t/innodb_file_limit_check.test 3900share/mysql/test/suite/innodb/t/innodb_file_limit_check.test
3892share/mysql/test/suite/innodb/t/innodb_force_recovery.test 3901share/mysql/test/suite/innodb/t/innodb_force_recovery.test
3893share/mysql/test/suite/innodb/t/innodb_gis.test 3902share/mysql/test/suite/innodb/t/innodb_gis.test
3894share/mysql/test/suite/innodb/t/innodb_i_s_innodb_locks.test 3903share/mysql/test/suite/innodb/t/innodb_i_s_innodb_locks.test
3895share/mysql/test/suite/innodb/t/innodb_i_s_innodb_trx.test 3904share/mysql/test/suite/innodb/t/innodb_i_s_innodb_trx.test
@@ -6515,26 +6524,27 @@ share/mysql/test/suite/rpl/r/rpl_mix_fou @@ -6515,26 +6524,27 @@ share/mysql/test/suite/rpl/r/rpl_mix_fou
6515share/mysql/test/suite/rpl/r/rpl_mix_insert_delayed.result 6524share/mysql/test/suite/rpl/r/rpl_mix_insert_delayed.result
6516share/mysql/test/suite/rpl/r/rpl_mix_missing_data_on_slave.result 6525share/mysql/test/suite/rpl/r/rpl_mix_missing_data_on_slave.result
6517share/mysql/test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result 6526share/mysql/test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
6518share/mysql/test/suite/rpl/r/rpl_mixed_bit_pk.result 6527share/mysql/test/suite/rpl/r/rpl_mixed_bit_pk.result
6519share/mysql/test/suite/rpl/r/rpl_mixed_ddl_dml.result 6528share/mysql/test/suite/rpl/r/rpl_mixed_ddl_dml.result
6520share/mysql/test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result 6529share/mysql/test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result
6521share/mysql/test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result 6530share/mysql/test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result
6522share/mysql/test/suite/rpl/r/rpl_mixed_mixing_engines.result 6531share/mysql/test/suite/rpl/r/rpl_mixed_mixing_engines.result
6523share/mysql/test/suite/rpl/r/rpl_mixed_row_innodb.result 6532share/mysql/test/suite/rpl/r/rpl_mixed_row_innodb.result
6524share/mysql/test/suite/rpl/r/rpl_mts_debug.result 6533share/mysql/test/suite/rpl/r/rpl_mts_debug.result
6525share/mysql/test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_off.result 6534share/mysql/test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_off.result
6526share/mysql/test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_on.result 6535share/mysql/test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_on.result
6527share/mysql/test/suite/rpl/r/rpl_mts_gtids_restart_slave_io_lost_trx.result 6536share/mysql/test/suite/rpl/r/rpl_mts_gtids_restart_slave_io_lost_trx.result
 6537share/mysql/test/suite/rpl/r/rpl_mts_pending_max.result
6528share/mysql/test/suite/rpl/r/rpl_mts_relay_log_post_crash_recovery.result 6538share/mysql/test/suite/rpl/r/rpl_mts_relay_log_post_crash_recovery.result
6529share/mysql/test/suite/rpl/r/rpl_mts_relay_log_recovery_on_error.result 6539share/mysql/test/suite/rpl/r/rpl_mts_relay_log_recovery_on_error.result
6530share/mysql/test/suite/rpl/r/rpl_mts_slave_hang_with_partial_trx.result 6540share/mysql/test/suite/rpl/r/rpl_mts_slave_hang_with_partial_trx.result
6531share/mysql/test/suite/rpl/r/rpl_mts_stop_slave.result 6541share/mysql/test/suite/rpl/r/rpl_mts_stop_slave.result
6532share/mysql/test/suite/rpl/r/rpl_multi_delete.result 6542share/mysql/test/suite/rpl/r/rpl_multi_delete.result
6533share/mysql/test/suite/rpl/r/rpl_multi_delete2.result 6543share/mysql/test/suite/rpl/r/rpl_multi_delete2.result
6534share/mysql/test/suite/rpl/r/rpl_multi_engine.result 6544share/mysql/test/suite/rpl/r/rpl_multi_engine.result
6535share/mysql/test/suite/rpl/r/rpl_multi_update.result 6545share/mysql/test/suite/rpl/r/rpl_multi_update.result
6536share/mysql/test/suite/rpl/r/rpl_multi_update2.result 6546share/mysql/test/suite/rpl/r/rpl_multi_update2.result
6537share/mysql/test/suite/rpl/r/rpl_multi_update3.result 6547share/mysql/test/suite/rpl/r/rpl_multi_update3.result
6538share/mysql/test/suite/rpl/r/rpl_multi_update4.result 6548share/mysql/test/suite/rpl/r/rpl_multi_update4.result
6539share/mysql/test/suite/rpl/r/rpl_mysql_upgrade.result 6549share/mysql/test/suite/rpl/r/rpl_mysql_upgrade.result
6540share/mysql/test/suite/rpl/r/rpl_mysqlbinlog_gtid_on.result 6550share/mysql/test/suite/rpl/r/rpl_mysqlbinlog_gtid_on.result
@@ -6574,26 +6584,27 @@ share/mysql/test/suite/rpl/r/rpl_read_on @@ -6574,26 +6584,27 @@ share/mysql/test/suite/rpl/r/rpl_read_on
6574share/mysql/test/suite/rpl/r/rpl_recovery_empty_sqlthd_pos.result 6584share/mysql/test/suite/rpl/r/rpl_recovery_empty_sqlthd_pos.result
6575share/mysql/test/suite/rpl/r/rpl_recovery_replicate_same_server_id.result 6585share/mysql/test/suite/rpl/r/rpl_recovery_replicate_same_server_id.result
6576share/mysql/test/suite/rpl/r/rpl_relay_log_recovery_positions.result 6586share/mysql/test/suite/rpl/r/rpl_relay_log_recovery_positions.result
6577share/mysql/test/suite/rpl/r/rpl_relay_space_innodb.result 6587share/mysql/test/suite/rpl/r/rpl_relay_space_innodb.result
6578share/mysql/test/suite/rpl/r/rpl_relay_space_myisam.result 6588share/mysql/test/suite/rpl/r/rpl_relay_space_myisam.result
6579share/mysql/test/suite/rpl/r/rpl_relayrotate.result 6589share/mysql/test/suite/rpl/r/rpl_relayrotate.result
6580share/mysql/test/suite/rpl/r/rpl_relayspace.result 6590share/mysql/test/suite/rpl/r/rpl_relayspace.result
6581share/mysql/test/suite/rpl/r/rpl_replicate_do.result 6591share/mysql/test/suite/rpl/r/rpl_replicate_do.result
6582share/mysql/test/suite/rpl/r/rpl_replicate_event_after_sync_stage.result 6592share/mysql/test/suite/rpl/r/rpl_replicate_event_after_sync_stage.result
6583share/mysql/test/suite/rpl/r/rpl_replicate_ignore_db.result 6593share/mysql/test/suite/rpl/r/rpl_replicate_ignore_db.result
6584share/mysql/test/suite/rpl/r/rpl_replicate_rewrite_db.result 6594share/mysql/test/suite/rpl/r/rpl_replicate_rewrite_db.result
6585share/mysql/test/suite/rpl/r/rpl_report.result 6595share/mysql/test/suite/rpl/r/rpl_report.result
6586share/mysql/test/suite/rpl/r/rpl_report_port.result 6596share/mysql/test/suite/rpl/r/rpl_report_port.result
 6597share/mysql/test/suite/rpl/r/rpl_reset_slave_fail.result
6587share/mysql/test/suite/rpl/r/rpl_rewrite_db_filter.result 6598share/mysql/test/suite/rpl/r/rpl_rewrite_db_filter.result
6588share/mysql/test/suite/rpl/r/rpl_rewrt_db.result 6599share/mysql/test/suite/rpl/r/rpl_rewrt_db.result
6589share/mysql/test/suite/rpl/r/rpl_rotate_gtid.result 6600share/mysql/test/suite/rpl/r/rpl_rotate_gtid.result
6590share/mysql/test/suite/rpl/r/rpl_rotate_logs.result 6601share/mysql/test/suite/rpl/r/rpl_rotate_logs.result
6591share/mysql/test/suite/rpl/r/rpl_rotate_purge_deadlock.result 6602share/mysql/test/suite/rpl/r/rpl_rotate_purge_deadlock.result
6592share/mysql/test/suite/rpl/r/rpl_rotate_row_trans.result 6603share/mysql/test/suite/rpl/r/rpl_rotate_row_trans.result
6593share/mysql/test/suite/rpl/r/rpl_row_001.result 6604share/mysql/test/suite/rpl/r/rpl_row_001.result
6594share/mysql/test/suite/rpl/r/rpl_row_4_bytes.result 6605share/mysql/test/suite/rpl/r/rpl_row_4_bytes.result
6595share/mysql/test/suite/rpl/r/rpl_row_NOW.result 6606share/mysql/test/suite/rpl/r/rpl_row_NOW.result
6596share/mysql/test/suite/rpl/r/rpl_row_USER.result 6607share/mysql/test/suite/rpl/r/rpl_row_USER.result
6597share/mysql/test/suite/rpl/r/rpl_row_UUID.result 6608share/mysql/test/suite/rpl/r/rpl_row_UUID.result
6598share/mysql/test/suite/rpl/r/rpl_row_basic_11bugs.result 6609share/mysql/test/suite/rpl/r/rpl_row_basic_11bugs.result
6599share/mysql/test/suite/rpl/r/rpl_row_basic_2myisam.result 6610share/mysql/test/suite/rpl/r/rpl_row_basic_2myisam.result
@@ -7107,26 +7118,27 @@ share/mysql/test/suite/rpl/t/rpl_mixed_d @@ -7107,26 +7118,27 @@ share/mysql/test/suite/rpl/t/rpl_mixed_d
7107share/mysql/test/suite/rpl/t/rpl_mixed_implicit_commit_binlog-master.opt 7118share/mysql/test/suite/rpl/t/rpl_mixed_implicit_commit_binlog-master.opt
7108share/mysql/test/suite/rpl/t/rpl_mixed_implicit_commit_binlog-slave.opt 7119share/mysql/test/suite/rpl/t/rpl_mixed_implicit_commit_binlog-slave.opt
7109share/mysql/test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test 7120share/mysql/test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test
7110share/mysql/test/suite/rpl/t/rpl_mixed_mixing_engines.test 7121share/mysql/test/suite/rpl/t/rpl_mixed_mixing_engines.test
7111share/mysql/test/suite/rpl/t/rpl_mixed_row_innodb-master.opt 7122share/mysql/test/suite/rpl/t/rpl_mixed_row_innodb-master.opt
7112share/mysql/test/suite/rpl/t/rpl_mts_debug-slave.opt 7123share/mysql/test/suite/rpl/t/rpl_mts_debug-slave.opt
7113share/mysql/test/suite/rpl/t/rpl_mts_debug.test 7124share/mysql/test/suite/rpl/t/rpl_mts_debug.test
7114share/mysql/test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_off-slave.opt 7125share/mysql/test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_off-slave.opt
7115share/mysql/test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_off.test 7126share/mysql/test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_off.test
7116share/mysql/test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_on-slave.opt 7127share/mysql/test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_on-slave.opt
7117share/mysql/test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_on.test 7128share/mysql/test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_on.test
7118share/mysql/test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx-slave.opt 7129share/mysql/test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx-slave.opt
7119share/mysql/test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx.test 7130share/mysql/test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx.test
 7131share/mysql/test/suite/rpl/t/rpl_mts_pending_max.test
7120share/mysql/test/suite/rpl/t/rpl_mts_relay_log_post_crash_recovery-slave.opt 7132share/mysql/test/suite/rpl/t/rpl_mts_relay_log_post_crash_recovery-slave.opt
7121share/mysql/test/suite/rpl/t/rpl_mts_relay_log_post_crash_recovery.test 7133share/mysql/test/suite/rpl/t/rpl_mts_relay_log_post_crash_recovery.test
7122share/mysql/test/suite/rpl/t/rpl_mts_relay_log_recovery_on_error-slave.opt 7134share/mysql/test/suite/rpl/t/rpl_mts_relay_log_recovery_on_error-slave.opt
7123share/mysql/test/suite/rpl/t/rpl_mts_relay_log_recovery_on_error.test 7135share/mysql/test/suite/rpl/t/rpl_mts_relay_log_recovery_on_error.test
7124share/mysql/test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx-slave.opt 7136share/mysql/test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx-slave.opt
7125share/mysql/test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx.test 7137share/mysql/test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx.test
7126share/mysql/test/suite/rpl/t/rpl_mts_stop_slave-slave.opt 7138share/mysql/test/suite/rpl/t/rpl_mts_stop_slave-slave.opt
7127share/mysql/test/suite/rpl/t/rpl_mts_stop_slave.test 7139share/mysql/test/suite/rpl/t/rpl_mts_stop_slave.test
7128share/mysql/test/suite/rpl/t/rpl_multi_delete-slave.opt 7140share/mysql/test/suite/rpl/t/rpl_multi_delete-slave.opt
7129share/mysql/test/suite/rpl/t/rpl_multi_delete.test 7141share/mysql/test/suite/rpl/t/rpl_multi_delete.test
7130share/mysql/test/suite/rpl/t/rpl_multi_delete2-slave.opt 7142share/mysql/test/suite/rpl/t/rpl_multi_delete2-slave.opt
7131share/mysql/test/suite/rpl/t/rpl_multi_delete2.test 7143share/mysql/test/suite/rpl/t/rpl_multi_delete2.test
7132share/mysql/test/suite/rpl/t/rpl_multi_engine.test 7144share/mysql/test/suite/rpl/t/rpl_multi_engine.test
@@ -7202,26 +7214,27 @@ share/mysql/test/suite/rpl/t/rpl_relayro @@ -7202,26 +7214,27 @@ share/mysql/test/suite/rpl/t/rpl_relayro
7202share/mysql/test/suite/rpl/t/rpl_relayrotate.test 7214share/mysql/test/suite/rpl/t/rpl_relayrotate.test
7203share/mysql/test/suite/rpl/t/rpl_relayspace-slave.opt 7215share/mysql/test/suite/rpl/t/rpl_relayspace-slave.opt
7204share/mysql/test/suite/rpl/t/rpl_relayspace.test 7216share/mysql/test/suite/rpl/t/rpl_relayspace.test
7205share/mysql/test/suite/rpl/t/rpl_replicate_do-slave.opt 7217share/mysql/test/suite/rpl/t/rpl_replicate_do-slave.opt
7206share/mysql/test/suite/rpl/t/rpl_replicate_do.test 7218share/mysql/test/suite/rpl/t/rpl_replicate_do.test
7207share/mysql/test/suite/rpl/t/rpl_replicate_event_after_sync_stage.test 7219share/mysql/test/suite/rpl/t/rpl_replicate_event_after_sync_stage.test
7208share/mysql/test/suite/rpl/t/rpl_replicate_ignore_db-slave.opt 7220share/mysql/test/suite/rpl/t/rpl_replicate_ignore_db-slave.opt
7209share/mysql/test/suite/rpl/t/rpl_replicate_ignore_db.test 7221share/mysql/test/suite/rpl/t/rpl_replicate_ignore_db.test
7210share/mysql/test/suite/rpl/t/rpl_replicate_rewrite_db.test 7222share/mysql/test/suite/rpl/t/rpl_replicate_rewrite_db.test
7211share/mysql/test/suite/rpl/t/rpl_report-slave.opt 7223share/mysql/test/suite/rpl/t/rpl_report-slave.opt
7212share/mysql/test/suite/rpl/t/rpl_report.test 7224share/mysql/test/suite/rpl/t/rpl_report.test
7213share/mysql/test/suite/rpl/t/rpl_report_port-master.opt 7225share/mysql/test/suite/rpl/t/rpl_report_port-master.opt
7214share/mysql/test/suite/rpl/t/rpl_report_port.test 7226share/mysql/test/suite/rpl/t/rpl_report_port.test
 7227share/mysql/test/suite/rpl/t/rpl_reset_slave_fail.test
7215share/mysql/test/suite/rpl/t/rpl_rewrite_db_filter-master.opt 7228share/mysql/test/suite/rpl/t/rpl_rewrite_db_filter-master.opt
7216share/mysql/test/suite/rpl/t/rpl_rewrite_db_filter-slave.opt 7229share/mysql/test/suite/rpl/t/rpl_rewrite_db_filter-slave.opt
7217share/mysql/test/suite/rpl/t/rpl_rewrite_db_filter.test 7230share/mysql/test/suite/rpl/t/rpl_rewrite_db_filter.test
7218share/mysql/test/suite/rpl/t/rpl_rewrt_db-slave.opt 7231share/mysql/test/suite/rpl/t/rpl_rewrt_db-slave.opt
7219share/mysql/test/suite/rpl/t/rpl_rewrt_db.test 7232share/mysql/test/suite/rpl/t/rpl_rewrt_db.test
7220share/mysql/test/suite/rpl/t/rpl_rotate_gtid.test 7233share/mysql/test/suite/rpl/t/rpl_rotate_gtid.test
7221share/mysql/test/suite/rpl/t/rpl_rotate_logs.cnf 7234share/mysql/test/suite/rpl/t/rpl_rotate_logs.cnf
7222share/mysql/test/suite/rpl/t/rpl_rotate_logs.test 7235share/mysql/test/suite/rpl/t/rpl_rotate_logs.test
7223share/mysql/test/suite/rpl/t/rpl_rotate_purge_deadlock-master.opt 7236share/mysql/test/suite/rpl/t/rpl_rotate_purge_deadlock-master.opt
7224share/mysql/test/suite/rpl/t/rpl_rotate_purge_deadlock.test 7237share/mysql/test/suite/rpl/t/rpl_rotate_purge_deadlock.test
7225share/mysql/test/suite/rpl/t/rpl_rotate_row_trans.test 7238share/mysql/test/suite/rpl/t/rpl_rotate_row_trans.test
7226share/mysql/test/suite/rpl/t/rpl_row_001.test 7239share/mysql/test/suite/rpl/t/rpl_row_001.test
7227share/mysql/test/suite/rpl/t/rpl_row_4_bytes-master.opt 7240share/mysql/test/suite/rpl/t/rpl_row_4_bytes-master.opt
@@ -8919,26 +8932,27 @@ share/mysql/test/t/archive_no_symlink-ma @@ -8919,26 +8932,27 @@ share/mysql/test/t/archive_no_symlink-ma
8919share/mysql/test/t/archive_no_symlink.test 8932share/mysql/test/t/archive_no_symlink.test
8920share/mysql/test/t/archive_plugin-master.opt 8933share/mysql/test/t/archive_plugin-master.opt
8921share/mysql/test/t/archive_plugin.test 8934share/mysql/test/t/archive_plugin.test
8922share/mysql/test/t/archive_symlink.test 8935share/mysql/test/t/archive_symlink.test
8923share/mysql/test/t/audit_plugin-master.opt 8936share/mysql/test/t/audit_plugin-master.opt
8924share/mysql/test/t/audit_plugin.test 8937share/mysql/test/t/audit_plugin.test
8925share/mysql/test/t/auth_rpl-master.opt 8938share/mysql/test/t/auth_rpl-master.opt
8926share/mysql/test/t/auth_rpl-slave.opt 8939share/mysql/test/t/auth_rpl-slave.opt
8927share/mysql/test/t/auth_rpl.test 8940share/mysql/test/t/auth_rpl.test
8928share/mysql/test/t/auto_increment.test 8941share/mysql/test/t/auto_increment.test
8929share/mysql/test/t/bench_count_distinct.test 8942share/mysql/test/t/bench_count_distinct.test
8930share/mysql/test/t/bigint.test 8943share/mysql/test/t/bigint.test
8931share/mysql/test/t/binary.test 8944share/mysql/test/t/binary.test
 8945share/mysql/test/t/binary_to_hex.test
8932share/mysql/test/t/blackhole.test 8946share/mysql/test/t/blackhole.test
8933share/mysql/test/t/blackhole_plugin-master.opt 8947share/mysql/test/t/blackhole_plugin-master.opt
8934share/mysql/test/t/blackhole_plugin.test 8948share/mysql/test/t/blackhole_plugin.test
8935share/mysql/test/t/bool.test 8949share/mysql/test/t/bool.test
8936share/mysql/test/t/bootstrap-master.opt 8950share/mysql/test/t/bootstrap-master.opt
8937share/mysql/test/t/bootstrap.test 8951share/mysql/test/t/bootstrap.test
8938share/mysql/test/t/bug12427262.test 8952share/mysql/test/t/bug12427262.test
8939share/mysql/test/t/bug12969156-master.opt 8953share/mysql/test/t/bug12969156-master.opt
8940share/mysql/test/t/bug12969156.test 8954share/mysql/test/t/bug12969156.test
8941share/mysql/test/t/bug17076131-master.opt 8955share/mysql/test/t/bug17076131-master.opt
8942share/mysql/test/t/bug17076131.test 8956share/mysql/test/t/bug17076131.test
8943share/mysql/test/t/bug33509-master.opt 8957share/mysql/test/t/bug33509-master.opt
8944share/mysql/test/t/bug33509.test 8958share/mysql/test/t/bug33509.test
@@ -9627,26 +9641,27 @@ share/mysql/test/t/select_icp_mrr.test @@ -9627,26 +9641,27 @@ share/mysql/test/t/select_icp_mrr.test
9627share/mysql/test/t/select_icp_mrr_bka.test 9641share/mysql/test/t/select_icp_mrr_bka.test
9628share/mysql/test/t/select_icp_mrr_bka_nixbnl.test 9642share/mysql/test/t/select_icp_mrr_bka_nixbnl.test
9629share/mysql/test/t/select_none.test 9643share/mysql/test/t/select_none.test
9630share/mysql/test/t/select_none_bka.test 9644share/mysql/test/t/select_none_bka.test
9631share/mysql/test/t/select_none_bka_nixbnl.test 9645share/mysql/test/t/select_none_bka_nixbnl.test
9632share/mysql/test/t/select_safe.test 9646share/mysql/test/t/select_safe.test
9633share/mysql/test/t/server_uuid.test 9647share/mysql/test/t/server_uuid.test
9634share/mysql/test/t/server_uuid_embedded.test 9648share/mysql/test/t/server_uuid_embedded.test
9635share/mysql/test/t/shm-master.opt 9649share/mysql/test/t/shm-master.opt
9636share/mysql/test/t/shm.test 9650share/mysql/test/t/shm.test
9637share/mysql/test/t/show_check-master.opt 9651share/mysql/test/t/show_check-master.opt
9638share/mysql/test/t/show_check.test 9652share/mysql/test/t/show_check.test
9639share/mysql/test/t/show_processlist.test 9653share/mysql/test/t/show_processlist.test
 9654share/mysql/test/t/show_processlist_state.test
9640share/mysql/test/t/show_profile.test 9655share/mysql/test/t/show_profile.test
9641share/mysql/test/t/signal.test 9656share/mysql/test/t/signal.test
9642share/mysql/test/t/signal_code.test 9657share/mysql/test/t/signal_code.test
9643share/mysql/test/t/signal_demo1.test 9658share/mysql/test/t/signal_demo1.test
9644share/mysql/test/t/signal_demo2.test 9659share/mysql/test/t/signal_demo2.test
9645share/mysql/test/t/signal_demo3-master.opt 9660share/mysql/test/t/signal_demo3-master.opt
9646share/mysql/test/t/signal_demo3.test 9661share/mysql/test/t/signal_demo3.test
9647share/mysql/test/t/signal_sqlmode.test 9662share/mysql/test/t/signal_sqlmode.test
9648share/mysql/test/t/single_delete_update.test 9663share/mysql/test/t/single_delete_update.test
9649share/mysql/test/t/skip_grants-master.opt 9664share/mysql/test/t/skip_grants-master.opt
9650share/mysql/test/t/skip_grants.test 9665share/mysql/test/t/skip_grants.test
9651share/mysql/test/t/skip_log_bin-master.opt 9666share/mysql/test/t/skip_log_bin-master.opt
9652share/mysql/test/t/skip_log_bin.test 9667share/mysql/test/t/skip_log_bin.test