Received: by mail.netbsd.org (Postfix, from userid 605) id 044D784D3E; Sun, 30 Jul 2017 04:58:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 88EDD84D3B for ; Sun, 30 Jul 2017 04:58:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id xWvjWFtqPIOz for ; Sun, 30 Jul 2017 04:57:59 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id E867284CF0 for ; Sun, 30 Jul 2017 04:57:58 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E2F21FACD; Sun, 30 Jul 2017 04:57:58 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1501390678153420" MIME-Version: 1.0 Date: Sun, 30 Jul 2017 04:57:58 +0000 From: "S.P.Zeidler" Subject: CVS commit: [pkgsrc-2017Q2] pkgsrc/databases To: pkgsrc-changes@NetBSD.org Reply-To: spz@netbsd.org X-Mailer: log_accum Message-Id: <20170730045758.E2F21FACD@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1501390678153420 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Module Name: pkgsrc Committed By: spz Date: Sun Jul 30 04:57:58 UTC 2017 Modified Files: pkgsrc/databases/mysql57-client [pkgsrc-2017Q2]: Makefile Makefile.common PLIST distinfo pkgsrc/databases/mysql57-client/patches [pkgsrc-2017Q2]: patch-libmysql_CMakeLists.txt pkgsrc/databases/mysql57-server [pkgsrc-2017Q2]: Makefile PLIST Added Files: pkgsrc/databases/mysql57-client/patches [pkgsrc-2017Q2]: patch-mysys_my__symlink.c Log Message: Pullup ticket #5526 - requested by taca databases/mysql57-client: security update databases/mysql57-server: security update Revisions pulled up: - databases/mysql57-client/Makefile 1.7 - databases/mysql57-client/Makefile.common 1.6 - databases/mysql57-client/PLIST 1.5 - databases/mysql57-client/distinfo 1.12 - databases/mysql57-client/patches/patch-libmysql_CMakeLists.txt 1.2 - databases/mysql57-client/patches/patch-mysys_my__symlink.c 1.1 - databases/mysql57-server/Makefile 1.8 - databases/mysql57-server/PLIST 1.5 ------------------------------------------------------------------- Module Name: pkgsrc Committed By: adam Date: Thu Jul 20 16:41:10 UTC 2017 Modified Files: pkgsrc/databases/mysql57-client: Makefile Makefile.common PLIST distinfo pkgsrc/databases/mysql57-client/patches: patch-libmysql_CMakeLists.txt pkgsrc/databases/mysql57-server: Makefile PLIST Added Files: pkgsrc/databases/mysql57-client/patches: patch-mysys_my__symlink.c 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.6 -r1.7 pkgsrc/databases/mysql57-client/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/mysql57-client/Makefile.common cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/mysql57-client/PLIST cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/mysql57-client/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/databases/mysql57-client/patches/patch-libmysql_CMakeLists.txt cvs rdiff -u -r0 -r1.1 \ pkgsrc/databases/mysql57-client/patches/patch-mysys_my__symlink.c cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/mysql57-server/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/mysql57-server/PLIST To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.6.2.1 pkgsrc/databases/mysql57-client/Makefile cvs rdiff -u -r1.5 -r1.5.2.1 pkgsrc/databases/mysql57-client/Makefile.common cvs rdiff -u -r1.4 -r1.4.2.1 pkgsrc/databases/mysql57-client/PLIST cvs rdiff -u -r1.11 -r1.11.2.1 pkgsrc/databases/mysql57-client/distinfo cvs rdiff -u -r1.1 -r1.1.8.1 \ pkgsrc/databases/mysql57-client/patches/patch-libmysql_CMakeLists.txt cvs rdiff -u -r0 -r1.1.2.2 \ pkgsrc/databases/mysql57-client/patches/patch-mysys_my__symlink.c cvs rdiff -u -r1.7 -r1.7.2.1 pkgsrc/databases/mysql57-server/Makefile cvs rdiff -u -r1.4 -r1.4.2.1 pkgsrc/databases/mysql57-server/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1501390678153420 Content-Disposition: inline Content-Length: 59429 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/databases/mysql57-client/Makefile diff -u pkgsrc/databases/mysql57-client/Makefile:1.6 pkgsrc/databases/mysql57-client/Makefile:1.6.2.1 --- pkgsrc/databases/mysql57-client/Makefile:1.6 Sun Apr 30 01:21:31 2017 +++ pkgsrc/databases/mysql57-client/Makefile Sun Jul 30 04:57:58 2017 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2017/04/30 01:21:31 ryoon Exp $ +# $NetBSD: Makefile,v 1.6.2.1 2017/07/30 04:57:58 spz Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} -PKGREVISION= 1 COMMENT= MySQL 5, a free SQL database (client) CONFLICTS= mysql3-client-[0-9]* Index: pkgsrc/databases/mysql57-client/Makefile.common diff -u pkgsrc/databases/mysql57-client/Makefile.common:1.5 pkgsrc/databases/mysql57-client/Makefile.common:1.5.2.1 --- pkgsrc/databases/mysql57-client/Makefile.common:1.5 Fri May 5 16:22:29 2017 +++ pkgsrc/databases/mysql57-client/Makefile.common Sun Jul 30 04:57:58 2017 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.5 2017/05/05 16:22:29 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.5.2.1 2017/07/30 04:57:58 spz Exp $ # # used by databases/mysql57-client/Makefile # used by databases/mysql57-server/Makefile -DISTNAME= mysql-5.7.18 +DISTNAME= mysql-5.7.19 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.7/} @@ -103,10 +103,11 @@ LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFI SUBST_CLASSES+= scr SUBST_STAGE.scr= pre-configure -SUBST_FILES.scr= scripts/mysqld_safe.sh \ - support-files/mysql.server.sh +SUBST_FILES.scr= scripts/mysqld_safe.sh +SUBST_FILES.scr+= support-files/mysql.server.sh SUBST_SED.scr= -e "s,chown,${CHOWN},g" SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g" +SUBST_SED.scr+= -e "s,@SHELL_PATH@,${RCD_SCRIPTS_SHELL},g" SUBST_MESSAGE.scr= Fixing scripts. # Don't use the base system "libedit" under NetBSD because MySQL expects Index: pkgsrc/databases/mysql57-client/PLIST diff -u pkgsrc/databases/mysql57-client/PLIST:1.4 pkgsrc/databases/mysql57-client/PLIST:1.4.2.1 --- pkgsrc/databases/mysql57-client/PLIST:1.4 Tue Apr 11 20:49:15 2017 +++ pkgsrc/databases/mysql57-client/PLIST Sun Jul 30 04:57:58 2017 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2017/04/11 20:49:15 adam Exp $ +@comment $NetBSD: PLIST,v 1.4.2.1 2017/07/30 04:57:58 spz Exp $ bin/mysql bin/mysql_client_test bin/mysql_config @@ -122,7 +122,7 @@ include/mysql/typelib.h lib/libmysqlclient.a lib/libmysqlclient.so lib/libmysqlclient.so.20 -lib/libmysqlclient.so.20.3.5 +lib/libmysqlclient.so.20.3.6 lib/pkgconfig/mysqlclient.pc man/man1/comp_err.1 man/man1/innochecksum.1 Index: pkgsrc/databases/mysql57-client/distinfo diff -u pkgsrc/databases/mysql57-client/distinfo:1.11 pkgsrc/databases/mysql57-client/distinfo:1.11.2.1 --- pkgsrc/databases/mysql57-client/distinfo:1.11 Sun Apr 30 05:10:32 2017 +++ pkgsrc/databases/mysql57-client/distinfo Sun Jul 30 04:57:58 2017 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.11 2017/04/30 05:10:32 adam Exp $ +$NetBSD: distinfo,v 1.11.2.1 2017/07/30 04:57:58 spz Exp $ -SHA1 (mysql-5.7.18.tar.gz) = d53fdc5f392af138cd66e13ee6d4e865767181e7 -RMD160 (mysql-5.7.18.tar.gz) = 40264f1c4a9113d6c84356488d2a2a7bc80920ad -SHA512 (mysql-5.7.18.tar.gz) = 88f8df96008d44328d184402dadf1dc54d5522fd4b0aebc8de8a6c11b4f38ae15d8b7f8112d8ff0015d6d46de11ef9275e1e2fd6b757afafce2a53503d3970dc -Size (mysql-5.7.18.tar.gz) = 51567774 bytes +SHA1 (mysql-5.7.19.tar.gz) = 2420bd5f12664c18313779668a8256aea53e52a0 +RMD160 (mysql-5.7.19.tar.gz) = 69f52cee63fe1344c487bd40e027a7dc57d067f7 +SHA512 (mysql-5.7.19.tar.gz) = 04296e480fc91381137a32d064f6d33d0a96b28ae64ca1202ef045a8e78434a61e81d83e36b8bfa7fccdcf37f1b65e955b4466c7d036bc014cecac83f0c4b1cf +Size (mysql-5.7.19.tar.gz) = 51686763 bytes SHA1 (patch-CMakeLists.txt) = b47592cf8801538375da3df2990fde4d292fc365 SHA1 (patch-client_CMakeLists.txt) = 304023577ab9c2152ca21fa9ff4895a22a321adf SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb @@ -18,10 +18,11 @@ SHA1 (patch-include_my__compare.h) = f45 SHA1 (patch-include_my__global.h) = 3870266cb1dd2cd0d58417dfe21bab19b62100e2 SHA1 (patch-include_my__thread.h) = 0f095acf94f8d130516dc4d858de1c64dd2bc127 SHA1 (patch-include_my__thread__os__id.h) = a51861b791086a0eeb9cb4d64892c5033da8c8eb -SHA1 (patch-libmysql_CMakeLists.txt) = 0105627fb9a5be56eaf21cda927589e0ffd99758 +SHA1 (patch-libmysql_CMakeLists.txt) = 00ce9c7f0e2c4132b872ffde05ee74e81c280f68 SHA1 (patch-mysql-test_CMakeLists.txt) = 4ba56ce255f5f89d9aece93181e54ddb572f301b SHA1 (patch-mysys__ssl_CMakeLists.txt) = 7ec44642cd13c5477175a94a007354c583ca9c3c SHA1 (patch-mysys_kqueue__timers.c) = 836803e9c7353b813bc22a5b69cc263dea384c9b +SHA1 (patch-mysys_my__symlink.c) = 23b57cd5922357d0bc72f5c15100a9fe1f89cfb2 SHA1 (patch-mysys_stacktrace.c) = 3e0794f544f0e35f44a694330885478247657842 SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_sock__probe__ix.c) = 1a389fca13ada1be74d96276e11baee16bbc2363 SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__memory.c) = 7077900830f904c74c79439b856d9d176fc27f15 Index: pkgsrc/databases/mysql57-client/patches/patch-libmysql_CMakeLists.txt diff -u pkgsrc/databases/mysql57-client/patches/patch-libmysql_CMakeLists.txt:1.1 pkgsrc/databases/mysql57-client/patches/patch-libmysql_CMakeLists.txt:1.1.8.1 --- pkgsrc/databases/mysql57-client/patches/patch-libmysql_CMakeLists.txt:1.1 Fri Sep 16 06:49:11 2016 +++ pkgsrc/databases/mysql57-client/patches/patch-libmysql_CMakeLists.txt Sun Jul 30 04:57:58 2017 @@ -1,13 +1,22 @@ -$NetBSD: patch-libmysql_CMakeLists.txt,v 1.1 2016/09/16 06:49:11 adam Exp $ +$NetBSD: patch-libmysql_CMakeLists.txt,v 1.1.8.1 2017/07/30 04:57:58 spz Exp $ Do not install libmysqlclient with the server. Generate versioned lib symlinks on FreeBSD to supress PLIST divergence. +authentication_ldap and libmysql_api_test require libmysqld. ---- libmysql/CMakeLists.txt.orig 2016-06-30 06:22:11.000000000 +0000 +--- libmysql/CMakeLists.txt.orig 2017-06-22 14:13:19.000000000 +0000 +++ libmysql/CMakeLists.txt -@@ -231,7 +231,11 @@ IF(WIN32) +@@ -230,12 +230,18 @@ IF(WIN32) + LIST(APPEND LIBS auth_win_client) ENDIF() ++IF(NOT WITHOUT_SERVER) + # LDAP authentication SASL client plugin + MESSAGE(STATUS "Creating LDAP authentication SASL client library.") +-ADD_SUBDIRECTORY(authentication_ldap) ++#ADD_SUBDIRECTORY(authentication_ldap) ++ENDIF() + # Merge several convenience libraries into one big mysqlclient +IF(WITHOUT_SERVER) MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) @@ -17,7 +26,7 @@ Generate versioned lib symlinks on FreeB # Visual Studio users need debug static library for debug projects IF(MSVC) -@@ -271,12 +275,18 @@ ENDIF() +@@ -275,12 +281,18 @@ ENDIF() IF(NOT DISABLE_SHARED) # Merge several convenience libraries into one big mysqlclient # and link them together into shared library. @@ -37,3 +46,17 @@ Generate versioned lib symlinks on FreeB SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") ELSE() SET(OS_SHARED_LIB_VERSION +@@ -348,6 +360,7 @@ CONFIGURE_FILE(api_test.c.in ${CMAKE_CUR + # from @CLIENT_API_FUNCTIONS@ are declared by . It will fail + # to run if not all of these symbols are exported by the library. + # ++IF(NOT WITHOUT_SERVER) + ADD_EXECUTABLE(libmysql_api_test ${CMAKE_CURRENT_BINARY_DIR}/api_test.c) + SET_TARGET_PROPERTIES(libmysql_api_test PROPERTIES LINKER_LANGUAGE CXX) + IF(LIBRT) +@@ -359,4 +372,5 @@ IF(DISABLE_SHARED) + ELSE() + TARGET_LINK_LIBRARIES(libmysql_api_test libmysql) + ENDIF() ++ENDIF() + Index: pkgsrc/databases/mysql57-server/Makefile diff -u pkgsrc/databases/mysql57-server/Makefile:1.7 pkgsrc/databases/mysql57-server/Makefile:1.7.2.1 --- pkgsrc/databases/mysql57-server/Makefile:1.7 Sat Jun 24 15:18:42 2017 +++ pkgsrc/databases/mysql57-server/Makefile Sun Jul 30 04:57:58 2017 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2017/06/24 15:18:42 schmonz Exp $ +# $NetBSD: Makefile,v 1.7.2.1 2017/07/30 04:57:58 spz Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} -PKGREVISION= 2 COMMENT= MySQL 5, a free SQL database (server) CONFLICTS= mysql3-server-[0-9]* @@ -58,8 +57,6 @@ REPLACE_PERL+= mysql-test/suite/funcs_2 REPLACE_PERL+= mysql-test/suite/opt_trace/validate_json.pl REPLACE_PERL+= mysql-test/suite/rpl/extension/bhs.pl REPLACE_PERL+= mysql-test/suite/rpl/extension/checksum.pl -REPLACE_PERL+= scripts/mysqld_multi.sh -REPLACE_PERL+= scripts/mysqldumpslow.sh REPLACE_SH+= mysql-test/suite/rpl/t/rpl_loaddata_symlink-master.sh REPLACE_SH+= mysql-test/suite/rpl/t/rpl_loaddata_symlink-slave.sh @@ -71,6 +68,14 @@ REPLACE_SH+= mysql-test/t/lowercase_mix CHECK_INTERPRETER_SKIP+=share/mysql/test/std_data/dtrace.d \ share/mysql/test/suite/opt_trace/validate_json.py +SUBST_CLASSES+= perlpath +SUBST_STAGE.perlpath= pre-configure +SUBST_MESSAGE.perlpath= Fixing Perl paths. +SUBST_FILES.perlpath= scripts/mysql_config.pl.in +SUBST_FILES.perlpath+= scripts/mysqld_multi.sh +SUBST_FILES.perlpath+= scripts/mysqldumpslow.sh +SUBST_SED.perlpath= -e 's,@PERL_PATH@,${PERL5},g' + # Replace interpreter without pulling in Python dependecy # Update when PYTHON_VERSION_DEFAULT changes! SUBST_CLASSES+= python Index: pkgsrc/databases/mysql57-server/PLIST diff -u pkgsrc/databases/mysql57-server/PLIST:1.4 pkgsrc/databases/mysql57-server/PLIST:1.4.2.1 --- pkgsrc/databases/mysql57-server/PLIST:1.4 Tue Apr 11 20:49:15 2017 +++ pkgsrc/databases/mysql57-server/PLIST Sun Jul 30 04:57:58 2017 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2017/04/11 20:49:15 adam Exp $ +@comment $NetBSD: PLIST,v 1.4.2.1 2017/07/30 04:57:58 spz Exp $ bin/innochecksum bin/lz4_decompress bin/my_print_defaults @@ -238,6 +238,7 @@ share/mysql/test/extra/rpl_tests/rpl_com share/mysql/test/extra/rpl_tests/rpl_conflicts.test share/mysql/test/extra/rpl_tests/rpl_crash_safe.inc share/mysql/test/extra/rpl_tests/rpl_crash_safe.test +share/mysql/test/extra/rpl_tests/rpl_create_msr_channels.inc share/mysql/test/extra/rpl_tests/rpl_ddl.test share/mysql/test/extra/rpl_tests/rpl_deadlock.test share/mysql/test/extra/rpl_tests/rpl_delete_no_where.test @@ -256,6 +257,7 @@ share/mysql/test/extra/rpl_tests/rpl_for share/mysql/test/extra/rpl_tests/rpl_generate_mts_gap.test share/mysql/test/extra/rpl_tests/rpl_get_master_version_and_clock.test share/mysql/test/extra/rpl_tests/rpl_gtid_drop_table.inc +share/mysql/test/extra/rpl_tests/rpl_gtid_mixed_rows_and_stmts_tx_isolation_error.inc share/mysql/test/extra/rpl_tests/rpl_gtid_mts_relay_log_recovery.test share/mysql/test/extra/rpl_tests/rpl_gtid_temp_table_in_func_or_trigger.inc share/mysql/test/extra/rpl_tests/rpl_gtids_restart_slave_io_lost_trx.test @@ -279,9 +281,11 @@ share/mysql/test/extra/rpl_tests/rpl_mix share/mysql/test/extra/rpl_tests/rpl_mts_crash_safe.inc share/mysql/test/extra/rpl_tests/rpl_mts_crash_safe.test share/mysql/test/extra/rpl_tests/rpl_mts_execute_partial_trx_in_relay_log.inc +share/mysql/test/extra/rpl_tests/rpl_mts_pending_events.inc share/mysql/test/extra/rpl_tests/rpl_mts_relay_log_recovery.test share/mysql/test/extra/rpl_tests/rpl_mts_transaction_retry.inc share/mysql/test/extra/rpl_tests/rpl_multi_query.test +share/mysql/test/extra/rpl_tests/rpl_multi_source_corrupt_repository.inc share/mysql/test/extra/rpl_tests/rpl_multi_source_generate_mts_gap.test share/mysql/test/extra/rpl_tests/rpl_multi_update.test share/mysql/test/extra/rpl_tests/rpl_multi_update2.test @@ -357,6 +361,7 @@ share/mysql/test/include/assert_grep.inc share/mysql/test/include/assert_gtid_mode_on.inc share/mysql/test/include/assert_logical_timestamps.inc share/mysql/test/include/assert_no_warnings.inc +share/mysql/test/include/assert_rbr_only_flags.inc share/mysql/test/include/assert_semisync_master_status_off.inc share/mysql/test/include/assert_semisync_master_status_on.inc share/mysql/test/include/assert_semisync_yesno_tx_increment.inc @@ -657,6 +662,7 @@ share/mysql/test/include/ipv6_func.inc share/mysql/test/include/is_embedded.inc share/mysql/test/include/join_cache.inc share/mysql/test/include/keyring_udf_keyring_plugin_loaded.inc +share/mysql/test/include/keyring_udf_keyring_plugin_loaded_store_operations.inc share/mysql/test/include/keyring_udf_keyring_plugin_loaded_symmetric.inc share/mysql/test/include/keyring_udf_keyring_plugin_not_loaded.inc share/mysql/test/include/keyring_udf_keyring_udf_plugin_not_loaded.inc @@ -1029,6 +1035,7 @@ share/mysql/test/r/bench_count_distinct. share/mysql/test/r/big_test.require share/mysql/test/r/bigint.result share/mysql/test/r/binary.result +share/mysql/test/r/binary_to_hex.result share/mysql/test/r/binlog_tx_isolation.result share/mysql/test/r/blackhole.result share/mysql/test/r/blackhole_plugin.result @@ -1542,6 +1549,7 @@ share/mysql/test/r/mysql_tzinfo_to_sql_s share/mysql/test/r/mysql_upgrade.result share/mysql/test/r/mysql_upgrade_slave_master_info.result share/mysql/test/r/mysql_upgrade_ssl.result +share/mysql/test/r/mysql_upgrade_with_session_user.result share/mysql/test/r/mysqladmin.result share/mysql/test/r/mysqlbinlog.result share/mysql/test/r/mysqlbinlog_debug.result @@ -1788,6 +1796,7 @@ share/mysql/test/r/session_tracker_trx_s share/mysql/test/r/shm.result share/mysql/test/r/shm_server_restart.result share/mysql/test/r/show_check.result +share/mysql/test/r/show_processlist_state.result share/mysql/test/r/show_profile.result share/mysql/test/r/show_variables.result share/mysql/test/r/shutdown.result @@ -2097,6 +2106,12 @@ share/mysql/test/std_data/crl-server-key share/mysql/test/std_data/crldir/ab8a3803.r0 share/mysql/test/std_data/des_key_file share/mysql/test/std_data/dtrace.d +share/mysql/test/std_data/expired-ca-key.pem +share/mysql/test/std_data/expired-ca.pem +share/mysql/test/std_data/expired-client-cert.pem +share/mysql/test/std_data/expired-client-key.pem +share/mysql/test/std_data/expired-server-cert.pem +share/mysql/test/std_data/expired-server-key.pem share/mysql/test/std_data/funcs_1/innodb_tb1.txt share/mysql/test/std_data/funcs_1/innodb_tb2.txt share/mysql/test/std_data/funcs_1/innodb_tb3.txt @@ -2368,12 +2383,14 @@ share/mysql/test/suite/binlog/r/binlog_g share/mysql/test/suite/binlog/r/binlog_gtid_mysqlbinlog_row_innodb.result share/mysql/test/suite/binlog/r/binlog_gtid_mysqlbinlog_row_myisam.result share/mysql/test/suite/binlog/r/binlog_gtid_mysqlbinlog_start_stop.result +share/mysql/test/suite/binlog/r/binlog_gtid_mysqldump.result share/mysql/test/suite/binlog/r/binlog_gtid_next_begin_caused_trx.result share/mysql/test/suite/binlog/r/binlog_gtid_next_partially_failed_grant.result share/mysql/test/suite/binlog/r/binlog_gtid_next_partially_failed_stmts.result share/mysql/test/suite/binlog/r/binlog_gtid_next_single_stmt_trx_rollback.result share/mysql/test/suite/binlog/r/binlog_gtid_next_temporary_table.result share/mysql/test/suite/binlog/r/binlog_gtid_next_xa.result +share/mysql/test/suite/binlog/r/binlog_gtid_rbr_only_flag.result share/mysql/test/suite/binlog/r/binlog_gtid_row_ctype_ucs.result share/mysql/test/suite/binlog/r/binlog_gtid_simple_recovery.result share/mysql/test/suite/binlog/r/binlog_gtid_state_update_deadlock.result @@ -2399,6 +2416,7 @@ share/mysql/test/suite/binlog/r/binlog_m share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_base64.result share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_concat.result share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_filter.result +share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_raw.result share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_rewrite_db.result share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_row.result share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result @@ -2410,6 +2428,7 @@ share/mysql/test/suite/binlog/r/binlog_n share/mysql/test/suite/binlog/r/binlog_old_versions.result share/mysql/test/suite/binlog/r/binlog_purge_binary_logs_stall.result share/mysql/test/suite/binlog/r/binlog_query_filter_rules.result +share/mysql/test/suite/binlog/r/binlog_rbr_only_savepoint.result share/mysql/test/suite/binlog/r/binlog_reset_master.result share/mysql/test/suite/binlog/r/binlog_rewrite.result share/mysql/test/suite/binlog/r/binlog_rewrite_db_noleak.result @@ -2457,10 +2476,15 @@ share/mysql/test/suite/binlog/r/binlog_s share/mysql/test/suite/binlog/r/binlog_switch_inside_trans.result share/mysql/test/suite/binlog/r/binlog_temporary_tables_user_var_event.result share/mysql/test/suite/binlog/r/binlog_tmp_table.result +share/mysql/test/suite/binlog/r/binlog_transaction_write_set_savepoint_basic.result +share/mysql/test/suite/binlog/r/binlog_transaction_write_set_savepoint_clear_identifiers.result +share/mysql/test/suite/binlog/r/binlog_transaction_write_set_savepoint_insert_overwrite_identifier.result +share/mysql/test/suite/binlog/r/binlog_transaction_write_set_savepoint_level.result share/mysql/test/suite/binlog/r/binlog_truncate_kill.result share/mysql/test/suite/binlog/r/binlog_truncate_myisam.result share/mysql/test/suite/binlog/r/binlog_trx_empty_assertions.result share/mysql/test/suite/binlog/r/binlog_unsafe.result +share/mysql/test/suite/binlog/r/binlog_use_gtid_skip.result share/mysql/test/suite/binlog/r/binlog_user_if_exists.result share/mysql/test/suite/binlog/r/binlog_variables_log_bin.result share/mysql/test/suite/binlog/r/binlog_variables_log_bin_index.result @@ -2472,6 +2496,7 @@ share/mysql/test/suite/binlog/r/binlog_w share/mysql/test/suite/binlog/r/binlog_wait_for_executed_gtid_set_no_gtid.result share/mysql/test/suite/binlog/r/binlog_wait_for_executed_gtid_set_unsafe_statement.result share/mysql/test/suite/binlog/r/binlog_write_error.result +share/mysql/test/suite/binlog/r/binlog_wrong_last_committed.result share/mysql/test/suite/binlog/r/binlog_xa_handling.result share/mysql/test/suite/binlog/r/binlog_xa_modify_gtid_executed_explicitly.result share/mysql/test/suite/binlog/r/binlog_xa_prepare_failure.result @@ -2544,12 +2569,14 @@ share/mysql/test/suite/binlog/t/binlog_g share/mysql/test/suite/binlog/t/binlog_gtid_mysqlbinlog_row_innodb.test share/mysql/test/suite/binlog/t/binlog_gtid_mysqlbinlog_row_myisam.test share/mysql/test/suite/binlog/t/binlog_gtid_mysqlbinlog_start_stop.test +share/mysql/test/suite/binlog/t/binlog_gtid_mysqldump.test share/mysql/test/suite/binlog/t/binlog_gtid_next_begin_caused_trx.test share/mysql/test/suite/binlog/t/binlog_gtid_next_partially_failed_grant.test share/mysql/test/suite/binlog/t/binlog_gtid_next_partially_failed_stmts.test share/mysql/test/suite/binlog/t/binlog_gtid_next_single_stmt_trx_rollback.test share/mysql/test/suite/binlog/t/binlog_gtid_next_temporary_table.test share/mysql/test/suite/binlog/t/binlog_gtid_next_xa.test +share/mysql/test/suite/binlog/t/binlog_gtid_rbr_only_flag.test share/mysql/test/suite/binlog/t/binlog_gtid_row_ctype_ucs.test share/mysql/test/suite/binlog/t/binlog_gtid_simple_recovery.test share/mysql/test/suite/binlog/t/binlog_gtid_state_update_deadlock.test @@ -2558,7 +2585,6 @@ share/mysql/test/suite/binlog/t/binlog_g share/mysql/test/suite/binlog/t/binlog_gtids_table_gcov.test share/mysql/test/suite/binlog/t/binlog_hexdump.test share/mysql/test/suite/binlog/t/binlog_implicit_commit.test -share/mysql/test/suite/binlog/t/binlog_incident-master.opt share/mysql/test/suite/binlog/t/binlog_incident.test share/mysql/test/suite/binlog/t/binlog_incident_ignore-master.opt share/mysql/test/suite/binlog/t/binlog_incident_ignore.test @@ -2582,6 +2608,7 @@ share/mysql/test/suite/binlog/t/binlog_m share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_base64.test share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_concat.test share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_filter.test +share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_raw.test share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_rewrite_db.test share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_row.test share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test @@ -2595,6 +2622,7 @@ share/mysql/test/suite/binlog/t/binlog_p share/mysql/test/suite/binlog/t/binlog_purge_binary_logs_stall.test share/mysql/test/suite/binlog/t/binlog_query_filter_rules-master.opt share/mysql/test/suite/binlog/t/binlog_query_filter_rules.test +share/mysql/test/suite/binlog/t/binlog_rbr_only_savepoint.test share/mysql/test/suite/binlog/t/binlog_reset_master.test share/mysql/test/suite/binlog/t/binlog_rewrite.test share/mysql/test/suite/binlog/t/binlog_rewrite_db_noleak.test @@ -2653,10 +2681,19 @@ share/mysql/test/suite/binlog/t/binlog_s share/mysql/test/suite/binlog/t/binlog_switch_inside_trans.test share/mysql/test/suite/binlog/t/binlog_temporary_tables_user_var_event.test share/mysql/test/suite/binlog/t/binlog_tmp_table.test +share/mysql/test/suite/binlog/t/binlog_transaction_write_set_savepoint_basic-master.opt +share/mysql/test/suite/binlog/t/binlog_transaction_write_set_savepoint_basic.test +share/mysql/test/suite/binlog/t/binlog_transaction_write_set_savepoint_clear_identifiers-master.opt +share/mysql/test/suite/binlog/t/binlog_transaction_write_set_savepoint_clear_identifiers.test +share/mysql/test/suite/binlog/t/binlog_transaction_write_set_savepoint_insert_overwrite_identifier-master.opt +share/mysql/test/suite/binlog/t/binlog_transaction_write_set_savepoint_insert_overwrite_identifier.test +share/mysql/test/suite/binlog/t/binlog_transaction_write_set_savepoint_level-master.opt +share/mysql/test/suite/binlog/t/binlog_transaction_write_set_savepoint_level.test share/mysql/test/suite/binlog/t/binlog_truncate_kill.test share/mysql/test/suite/binlog/t/binlog_truncate_myisam.test share/mysql/test/suite/binlog/t/binlog_unsafe-master.opt share/mysql/test/suite/binlog/t/binlog_unsafe.test +share/mysql/test/suite/binlog/t/binlog_use_gtid_skip.test share/mysql/test/suite/binlog/t/binlog_user_if_exists.test share/mysql/test/suite/binlog/t/binlog_variables_log_bin-master.opt share/mysql/test/suite/binlog/t/binlog_variables_log_bin.test @@ -2672,6 +2709,7 @@ share/mysql/test/suite/binlog/t/binlog_w share/mysql/test/suite/binlog/t/binlog_wait_for_executed_gtid_set_no_gtid.test share/mysql/test/suite/binlog/t/binlog_wait_for_executed_gtid_set_unsafe_statement.test share/mysql/test/suite/binlog/t/binlog_write_error.test +share/mysql/test/suite/binlog/t/binlog_wrong_last_committed.test share/mysql/test/suite/binlog/t/binlog_xa_handling.test share/mysql/test/suite/binlog/t/binlog_xa_modify_gtid_executed_explicitly.test share/mysql/test/suite/binlog/t/binlog_xa_prepare_failure.test @@ -4089,6 +4127,7 @@ share/mysql/test/suite/group_replication share/mysql/test/suite/group_replication/r/gr_autoincrement_parallel_insert.result share/mysql/test/suite/group_replication/r/gr_autostart_on_install.result share/mysql/test/suite/group_replication/r/gr_basic_crud_on_doc.result +share/mysql/test/suite/group_replication/r/gr_binlog_checksum_failure.result share/mysql/test/suite/group_replication/r/gr_binlog_replay_to_group.result share/mysql/test/suite/group_replication/r/gr_blob.result share/mysql/test/suite/group_replication/r/gr_capture.result @@ -4145,6 +4184,7 @@ share/mysql/test/suite/group_replication share/mysql/test/suite/group_replication/r/gr_gtid_assignment_block_size.result share/mysql/test/suite/group_replication/r/gr_gtid_assignment_blocks_gaps_in_the_beginning.result share/mysql/test/suite/group_replication/r/gr_gtid_assignment_blocks_near_gno_exhaustion.result +share/mysql/test/suite/group_replication/r/gr_gtid_next_conflict.result share/mysql/test/suite/group_replication/r/gr_hash_partition_tables.result share/mysql/test/suite/group_replication/r/gr_high_prio_rollback.result share/mysql/test/suite/group_replication/r/gr_high_prio_trx.result @@ -4181,6 +4221,9 @@ share/mysql/test/suite/group_replication share/mysql/test/suite/group_replication/r/gr_multiple_groups_with_same_name.result share/mysql/test/suite/group_replication/r/gr_multiple_version_members.result share/mysql/test/suite/group_replication/r/gr_negative_certification.result +share/mysql/test/suite/group_replication/r/gr_network_partition_handling.result +share/mysql/test/suite/group_replication/r/gr_network_partition_handling_after_restore.result +share/mysql/test/suite/group_replication/r/gr_no_user_start_failure.result share/mysql/test/suite/group_replication/r/gr_nullable_unique_key_conflict.result share/mysql/test/suite/group_replication/r/gr_operation_ignore_super_read_only.result share/mysql/test/suite/group_replication/r/gr_parallel_applier_indexes.result @@ -4247,6 +4290,7 @@ share/mysql/test/suite/group_replication share/mysql/test/suite/group_replication/r/gr_relay_log_name_change.result share/mysql/test/suite/group_replication/r/gr_relay_log_recovery.result share/mysql/test/suite/group_replication/r/gr_repeatable_read_isolation.result +share/mysql/test/suite/group_replication/r/gr_replicate_group_to_group.result share/mysql/test/suite/group_replication/r/gr_replicate_group_to_server.result share/mysql/test/suite/group_replication/r/gr_replicate_group_to_server_parallel_applier_db.result share/mysql/test/suite/group_replication/r/gr_replicate_server_to_group.result @@ -4258,6 +4302,10 @@ share/mysql/test/suite/group_replication share/mysql/test/suite/group_replication/r/gr_restore_super_read_only.result share/mysql/test/suite/group_replication/r/gr_row_implicit_commit_binlog.result share/mysql/test/suite/group_replication/r/gr_runtime_verifications.result +share/mysql/test/suite/group_replication/r/gr_savepoint.result +share/mysql/test/suite/group_replication/r/gr_savepoint_crash.result +share/mysql/test/suite/group_replication/r/gr_savepoint_crash_on_release.result +share/mysql/test/suite/group_replication/r/gr_savepoint_crash_on_rollback.result share/mysql/test/suite/group_replication/r/gr_serializable_isolation.result share/mysql/test/suite/group_replication/r/gr_server_failover_while_dml.result share/mysql/test/suite/group_replication/r/gr_server_failover_while_dml_on_other.result @@ -4273,6 +4321,11 @@ share/mysql/test/suite/group_replication share/mysql/test/suite/group_replication/r/gr_show_slave_status_for_channel_recovery.result share/mysql/test/suite/group_replication/r/gr_single_primary_and_leader_election.result share/mysql/test/suite/group_replication/r/gr_single_primary_and_leader_election_on_error.result +share/mysql/test/suite/group_replication/r/gr_single_primary_async_after_gr_primary.result +share/mysql/test/suite/group_replication/r/gr_single_primary_async_after_gr_secondary.result +share/mysql/test/suite/group_replication/r/gr_single_primary_async_before_gr_primary.result +share/mysql/test/suite/group_replication/r/gr_single_primary_async_before_gr_secondary.result +share/mysql/test/suite/group_replication/r/gr_single_primary_async_gr_start_on_boot.result share/mysql/test/suite/group_replication/r/gr_single_primary_conflict_detection.result share/mysql/test/suite/group_replication/r/gr_single_primary_double_change.result share/mysql/test/suite/group_replication/r/gr_single_primary_majority_loss_1.result @@ -4286,6 +4339,7 @@ share/mysql/test/suite/group_replication share/mysql/test/suite/group_replication/r/gr_single_primary_stop.result share/mysql/test/suite/group_replication/r/gr_single_primary_super_read_at_exit.result share/mysql/test/suite/group_replication/r/gr_single_primary_var_checks.result +share/mysql/test/suite/group_replication/r/gr_single_primary_verify_next_leader.result share/mysql/test/suite/group_replication/r/gr_single_primary_with_foreign_key_cascade.result share/mysql/test/suite/group_replication/r/gr_single_primary_with_transaction_isolation.result share/mysql/test/suite/group_replication/r/gr_skip_gtid_multiple_servers.result @@ -4307,6 +4361,7 @@ share/mysql/test/suite/group_replication share/mysql/test/suite/group_replication/r/gr_start_on_boot.result share/mysql/test/suite/group_replication/r/gr_start_replication_auto.result share/mysql/test/suite/group_replication/r/gr_start_replication_auto_with_ssl_recovery.result +share/mysql/test/suite/group_replication/r/gr_start_replication_auto_with_super_read_only.result share/mysql/test/suite/group_replication/r/gr_start_replication_auto_write_protection.result share/mysql/test/suite/group_replication/r/gr_start_stop_behaviour.result share/mysql/test/suite/group_replication/r/gr_start_stop_parallel_applier_database.result @@ -4329,13 +4384,14 @@ share/mysql/test/suite/group_replication share/mysql/test/suite/group_replication/r/gr_table_without_primary_key.result share/mysql/test/suite/group_replication/r/gr_to_binlogless_slave.result share/mysql/test/suite/group_replication/r/gr_transaction_compatibility_basics.result +share/mysql/test/suite/group_replication/r/gr_transaction_limit.result +share/mysql/test/suite/group_replication/r/gr_transaction_limit_option.result share/mysql/test/suite/group_replication/r/gr_uninstall_install_plugin.result share/mysql/test/suite/group_replication/r/gr_uninstall_while_disabled.result share/mysql/test/suite/group_replication/r/gr_unique_key_conflict.result share/mysql/test/suite/group_replication/r/gr_unique_key_table_requirements.result share/mysql/test/suite/group_replication/r/gr_user.result share/mysql/test/suite/group_replication/r/gr_user_admin.result -share/mysql/test/suite/group_replication/r/gr_user_recreation.result share/mysql/test/suite/group_replication/r/gr_variables_default_values.result share/mysql/test/suite/group_replication/r/gr_variables_mysqladmin.result share/mysql/test/suite/group_replication/r/gr_view_change_event_wait_break.result @@ -4377,6 +4433,7 @@ share/mysql/test/suite/group_replication share/mysql/test/suite/group_replication/t/gr_autostart_on_install.test share/mysql/test/suite/group_replication/t/gr_basic_crud_on_doc.cnf share/mysql/test/suite/group_replication/t/gr_basic_crud_on_doc.test +share/mysql/test/suite/group_replication/t/gr_binlog_checksum_failure.test share/mysql/test/suite/group_replication/t/gr_binlog_replay_to_group.cnf share/mysql/test/suite/group_replication/t/gr_binlog_replay_to_group.test share/mysql/test/suite/group_replication/t/gr_blob.test @@ -4465,6 +4522,8 @@ share/mysql/test/suite/group_replication share/mysql/test/suite/group_replication/t/gr_gtid_assignment_blocks_gaps_in_the_beginning-slave.opt share/mysql/test/suite/group_replication/t/gr_gtid_assignment_blocks_gaps_in_the_beginning.test share/mysql/test/suite/group_replication/t/gr_gtid_assignment_blocks_near_gno_exhaustion.test +share/mysql/test/suite/group_replication/t/gr_gtid_next_conflict-master.opt +share/mysql/test/suite/group_replication/t/gr_gtid_next_conflict.test share/mysql/test/suite/group_replication/t/gr_hash_partition_tables.cnf share/mysql/test/suite/group_replication/t/gr_hash_partition_tables.test share/mysql/test/suite/group_replication/t/gr_heartbeat-master.opt @@ -4514,6 +4573,11 @@ share/mysql/test/suite/group_replication share/mysql/test/suite/group_replication/t/gr_multiple_version_members.cnf share/mysql/test/suite/group_replication/t/gr_multiple_version_members.test share/mysql/test/suite/group_replication/t/gr_negative_certification.test +share/mysql/test/suite/group_replication/t/gr_network_partition_handling.cnf +share/mysql/test/suite/group_replication/t/gr_network_partition_handling.test +share/mysql/test/suite/group_replication/t/gr_network_partition_handling_after_restore.cnf +share/mysql/test/suite/group_replication/t/gr_network_partition_handling_after_restore.test +share/mysql/test/suite/group_replication/t/gr_no_user_start_failure.test share/mysql/test/suite/group_replication/t/gr_nullable_unique_key_conflict.test share/mysql/test/suite/group_replication/t/gr_operation_ignore_super_read_only.test share/mysql/test/suite/group_replication/t/gr_parallel_applier_indexes.cnf @@ -4617,6 +4681,8 @@ share/mysql/test/suite/group_replication share/mysql/test/suite/group_replication/t/gr_relay_log_name_change.test share/mysql/test/suite/group_replication/t/gr_relay_log_recovery.test share/mysql/test/suite/group_replication/t/gr_repeatable_read_isolation.test +share/mysql/test/suite/group_replication/t/gr_replicate_group_to_group.cnf +share/mysql/test/suite/group_replication/t/gr_replicate_group_to_group.test share/mysql/test/suite/group_replication/t/gr_replicate_group_to_server.cnf share/mysql/test/suite/group_replication/t/gr_replicate_group_to_server.test share/mysql/test/suite/group_replication/t/gr_replicate_group_to_server_parallel_applier_db.cnf @@ -4637,6 +4703,10 @@ share/mysql/test/suite/group_replication share/mysql/test/suite/group_replication/t/gr_restore_super_read_only.test share/mysql/test/suite/group_replication/t/gr_row_implicit_commit_binlog.test share/mysql/test/suite/group_replication/t/gr_runtime_verifications.test +share/mysql/test/suite/group_replication/t/gr_savepoint.test +share/mysql/test/suite/group_replication/t/gr_savepoint_crash.test +share/mysql/test/suite/group_replication/t/gr_savepoint_crash_on_release.test +share/mysql/test/suite/group_replication/t/gr_savepoint_crash_on_rollback.test share/mysql/test/suite/group_replication/t/gr_serializable_isolation.test share/mysql/test/suite/group_replication/t/gr_server_failover_while_dml.cnf share/mysql/test/suite/group_replication/t/gr_server_failover_while_dml.test @@ -4656,6 +4726,18 @@ share/mysql/test/suite/group_replication share/mysql/test/suite/group_replication/t/gr_single_primary_and_leader_election.test share/mysql/test/suite/group_replication/t/gr_single_primary_and_leader_election_on_error.cnf share/mysql/test/suite/group_replication/t/gr_single_primary_and_leader_election_on_error.test +share/mysql/test/suite/group_replication/t/gr_single_primary_async_after_gr_primary.cnf +share/mysql/test/suite/group_replication/t/gr_single_primary_async_after_gr_primary.test +share/mysql/test/suite/group_replication/t/gr_single_primary_async_after_gr_secondary-slave.opt +share/mysql/test/suite/group_replication/t/gr_single_primary_async_after_gr_secondary.cnf +share/mysql/test/suite/group_replication/t/gr_single_primary_async_after_gr_secondary.test +share/mysql/test/suite/group_replication/t/gr_single_primary_async_before_gr_primary.test +share/mysql/test/suite/group_replication/t/gr_single_primary_async_before_gr_secondary-slave.opt +share/mysql/test/suite/group_replication/t/gr_single_primary_async_before_gr_secondary.cnf +share/mysql/test/suite/group_replication/t/gr_single_primary_async_before_gr_secondary.test +share/mysql/test/suite/group_replication/t/gr_single_primary_async_gr_start_on_boot-slave.opt +share/mysql/test/suite/group_replication/t/gr_single_primary_async_gr_start_on_boot.cnf +share/mysql/test/suite/group_replication/t/gr_single_primary_async_gr_start_on_boot.test share/mysql/test/suite/group_replication/t/gr_single_primary_conflict_detection.cnf share/mysql/test/suite/group_replication/t/gr_single_primary_conflict_detection.test share/mysql/test/suite/group_replication/t/gr_single_primary_double_change.cnf @@ -4676,6 +4758,8 @@ share/mysql/test/suite/group_replication share/mysql/test/suite/group_replication/t/gr_single_primary_stop.test share/mysql/test/suite/group_replication/t/gr_single_primary_super_read_at_exit.test share/mysql/test/suite/group_replication/t/gr_single_primary_var_checks.test +share/mysql/test/suite/group_replication/t/gr_single_primary_verify_next_leader.cnf +share/mysql/test/suite/group_replication/t/gr_single_primary_verify_next_leader.test share/mysql/test/suite/group_replication/t/gr_single_primary_with_foreign_key_cascade.test share/mysql/test/suite/group_replication/t/gr_single_primary_with_transaction_isolation.test share/mysql/test/suite/group_replication/t/gr_skip_gtid_multiple_servers.test @@ -4707,6 +4791,8 @@ share/mysql/test/suite/group_replication share/mysql/test/suite/group_replication/t/gr_start_replication_auto.test share/mysql/test/suite/group_replication/t/gr_start_replication_auto_with_ssl_recovery-master.opt share/mysql/test/suite/group_replication/t/gr_start_replication_auto_with_ssl_recovery.test +share/mysql/test/suite/group_replication/t/gr_start_replication_auto_with_super_read_only-master.opt +share/mysql/test/suite/group_replication/t/gr_start_replication_auto_with_super_read_only.test share/mysql/test/suite/group_replication/t/gr_start_replication_auto_write_protection.test share/mysql/test/suite/group_replication/t/gr_start_stop_behaviour.test share/mysql/test/suite/group_replication/t/gr_start_stop_parallel_applier_database.test @@ -4742,15 +4828,16 @@ share/mysql/test/suite/group_replication share/mysql/test/suite/group_replication/t/gr_to_binlogless_slave.test share/mysql/test/suite/group_replication/t/gr_transaction_compatibility_basics-slave.opt share/mysql/test/suite/group_replication/t/gr_transaction_compatibility_basics.test +share/mysql/test/suite/group_replication/t/gr_transaction_limit.cnf +share/mysql/test/suite/group_replication/t/gr_transaction_limit.test +share/mysql/test/suite/group_replication/t/gr_transaction_limit_option.test share/mysql/test/suite/group_replication/t/gr_uninstall_install_plugin.test share/mysql/test/suite/group_replication/t/gr_uninstall_while_disabled-master.opt share/mysql/test/suite/group_replication/t/gr_uninstall_while_disabled.test share/mysql/test/suite/group_replication/t/gr_unique_key_conflict.test share/mysql/test/suite/group_replication/t/gr_unique_key_table_requirements.test -share/mysql/test/suite/group_replication/t/gr_user-master.opt share/mysql/test/suite/group_replication/t/gr_user.test share/mysql/test/suite/group_replication/t/gr_user_admin.test -share/mysql/test/suite/group_replication/t/gr_user_recreation.test share/mysql/test/suite/group_replication/t/gr_variables_default_values.test share/mysql/test/suite/group_replication/t/gr_variables_mysqladmin.test share/mysql/test/suite/group_replication/t/gr_view_change_event_wait_break.test @@ -5108,6 +5195,7 @@ share/mysql/test/suite/innodb/r/readahea share/mysql/test/suite/innodb/r/readonly.result share/mysql/test/suite/innodb/r/records_in_range.result share/mysql/test/suite/innodb/r/redo_log_during_checkpoint.result +share/mysql/test/suite/innodb/r/rename_table.result share/mysql/test/suite/innodb/r/row_format_redundant.result share/mysql/test/suite/innodb/r/sp_temp_table.result share/mysql/test/suite/innodb/r/stored_fk.result @@ -5521,6 +5609,7 @@ share/mysql/test/suite/innodb/t/readahea share/mysql/test/suite/innodb/t/readonly.test share/mysql/test/suite/innodb/t/records_in_range.test share/mysql/test/suite/innodb/t/redo_log_during_checkpoint.test +share/mysql/test/suite/innodb/t/rename_table.test share/mysql/test/suite/innodb/t/row_format_redundant.test share/mysql/test/suite/innodb/t/sp_temp_table.test share/mysql/test/suite/innodb/t/stored_fk.test @@ -6403,6 +6492,7 @@ share/mysql/test/suite/memcached/r/memc2 share/mysql/test/suite/memcached/r/memc283_misc.result share/mysql/test/suite/memcached/r/memc284_misc.result share/mysql/test/suite/memcached/r/memc285_FTWRL.result +share/mysql/test/suite/memcached/r/memc290_read_committed.result share/mysql/test/suite/memcached/r/memcached_alter_column.result share/mysql/test/suite/memcached/r/memcached_virtual_block.result share/mysql/test/suite/memcached/r/rpl_memc270_1.result @@ -6525,6 +6615,8 @@ share/mysql/test/suite/memcached/t/memc2 share/mysql/test/suite/memcached/t/memc284_misc.test share/mysql/test/suite/memcached/t/memc285_FTWRL-master.opt share/mysql/test/suite/memcached/t/memc285_FTWRL.test +share/mysql/test/suite/memcached/t/memc290_read_committed-master.opt +share/mysql/test/suite/memcached/t/memc290_read_committed.test share/mysql/test/suite/memcached/t/memcached_alter_column-master.opt share/mysql/test/suite/memcached/t/memcached_alter_column.test share/mysql/test/suite/memcached/t/memcached_virtual_block-master.opt @@ -7844,6 +7936,7 @@ share/mysql/test/suite/parts/r/partition share/mysql/test/suite/parts/r/partition_reorganize_innodb.result share/mysql/test/suite/parts/r/partition_reorganize_myisam.result share/mysql/test/suite/parts/r/partition_repair_myisam.result +share/mysql/test/suite/parts/r/partition_reverse_scan_icp.result share/mysql/test/suite/parts/r/partition_special_innodb.result share/mysql/test/suite/parts/r/partition_special_myisam.result share/mysql/test/suite/parts/r/partition_syntax_innodb.result @@ -7991,6 +8084,7 @@ share/mysql/test/suite/parts/t/partition share/mysql/test/suite/parts/t/partition_reorganize_innodb.test share/mysql/test/suite/parts/t/partition_reorganize_myisam.test share/mysql/test/suite/parts/t/partition_repair_myisam.test +share/mysql/test/suite/parts/t/partition_reverse_scan_icp.test share/mysql/test/suite/parts/t/partition_special_innodb-master.opt share/mysql/test/suite/parts/t/partition_special_innodb.test share/mysql/test/suite/parts/t/partition_special_myisam.test @@ -9252,6 +9346,7 @@ share/mysql/test/suite/rpl/r/rpl_change_ share/mysql/test/suite/rpl/r/rpl_change_master_dbug.result share/mysql/test/suite/rpl/r/rpl_change_master_open_temp_tables.result share/mysql/test/suite/rpl/r/rpl_change_master_relay_log_purge.result +share/mysql/test/suite/rpl/r/rpl_change_master_to_master_delay.result share/mysql/test/suite/rpl/r/rpl_change_master_without_stopping_slave.result share/mysql/test/suite/rpl/r/rpl_charset.result share/mysql/test/suite/rpl/r/rpl_charset_sjis.result @@ -9289,6 +9384,7 @@ share/mysql/test/suite/rpl/r/rpl_do_tabl share/mysql/test/suite/rpl/r/rpl_drop.result share/mysql/test/suite/rpl/r/rpl_drop_db.result share/mysql/test/suite/rpl/r/rpl_drop_db_fail.result +share/mysql/test/suite/rpl/r/rpl_drop_scheduled_event.result share/mysql/test/suite/rpl/r/rpl_drop_temp.result share/mysql/test/suite/rpl/r/rpl_drop_temp_gtid.result share/mysql/test/suite/rpl/r/rpl_drop_temp_tbl_with_rewrite_db.result @@ -9345,6 +9441,7 @@ share/mysql/test/suite/rpl/r/rpl_gtid_hu share/mysql/test/suite/rpl/r/rpl_gtid_ignore_table_filter_insensitive.result share/mysql/test/suite/rpl/r/rpl_gtid_ignore_table_filter_sensitive.result share/mysql/test/suite/rpl/r/rpl_gtid_loaddata_s.result +share/mysql/test/suite/rpl/r/rpl_gtid_mixed_rows_and_stmts_tx_isolation_error.result share/mysql/test/suite/rpl/r/rpl_gtid_mode.result share/mysql/test/suite/rpl/r/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off.result share/mysql/test/suite/rpl/r/rpl_gtid_mts_replicate_same_server_id.result @@ -9357,6 +9454,9 @@ share/mysql/test/suite/rpl/r/rpl_gtid_re share/mysql/test/suite/rpl/r/rpl_gtid_retrieve_last_trx.result share/mysql/test/suite/rpl/r/rpl_gtid_row_event_max_size.result share/mysql/test/suite/rpl/r/rpl_gtid_server_sighup.result +share/mysql/test/suite/rpl/r/rpl_gtid_skip_incident_caused_by_insufficient_stmt_cache.result +share/mysql/test/suite/rpl/r/rpl_gtid_skip_incident_caused_by_partially_failed_grant.result +share/mysql/test/suite/rpl/r/rpl_gtid_skip_partial_trx.result share/mysql/test/suite/rpl/r/rpl_gtid_spanned_trx.result share/mysql/test/suite/rpl/r/rpl_gtid_split_statements.result share/mysql/test/suite/rpl/r/rpl_gtid_sql_until_before_after.result @@ -9382,7 +9482,7 @@ share/mysql/test/suite/rpl/r/rpl_ignore_ share/mysql/test/suite/rpl/r/rpl_ignore_table_filter_insensitive.result share/mysql/test/suite/rpl/r/rpl_ignore_table_filter_sensitive.result share/mysql/test/suite/rpl/r/rpl_ignore_table_update.result -share/mysql/test/suite/rpl/r/rpl_incident.result +share/mysql/test/suite/rpl/r/rpl_inconsistent_error.result share/mysql/test/suite/rpl/r/rpl_init_slave.result share/mysql/test/suite/rpl/r/rpl_init_slave_errors.result share/mysql/test/suite/rpl/r/rpl_innodb_bug28430.result @@ -9449,6 +9549,7 @@ share/mysql/test/suite/rpl/r/rpl_mts_log share/mysql/test/suite/rpl/r/rpl_mts_logical_clock_timestamping.result share/mysql/test/suite/rpl/r/rpl_mts_logical_clock_transaction_retry.result share/mysql/test/suite/rpl/r/rpl_mts_logical_clock_wrong_start_pos.result +share/mysql/test/suite/rpl/r/rpl_mts_pending_max.result share/mysql/test/suite/rpl/r/rpl_mts_relay_log_post_crash_recovery.result share/mysql/test/suite/rpl/r/rpl_mts_relay_log_recovery_on_error.result share/mysql/test/suite/rpl/r/rpl_mts_slave_hang_with_partial_trx.result @@ -9466,6 +9567,7 @@ share/mysql/test/suite/rpl/r/rpl_multi_s share/mysql/test/suite/rpl/r/rpl_multi_source_channel_map_stress.result share/mysql/test/suite/rpl/r/rpl_multi_source_channel_name_relay_log.result share/mysql/test/suite/rpl/r/rpl_multi_source_cmd_errors.result +share/mysql/test/suite/rpl/r/rpl_multi_source_corrupt_repository.result share/mysql/test/suite/rpl/r/rpl_multi_source_flush_relay_logs.result share/mysql/test/suite/rpl/r/rpl_multi_source_init_failure.result share/mysql/test/suite/rpl/r/rpl_multi_source_mts_recovery.result @@ -9491,6 +9593,7 @@ share/mysql/test/suite/rpl/r/rpl_mysqlbi share/mysql/test/suite/rpl/r/rpl_name_const.result share/mysql/test/suite/rpl/r/rpl_no_gtid_delete_memory_table_after_start_server.result share/mysql/test/suite/rpl/r/rpl_no_gtid_split_statements.result +share/mysql/test/suite/rpl/r/rpl_nogtid_rollback_on_anonymous_gtid.result share/mysql/test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result share/mysql/test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result share/mysql/test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result @@ -9565,6 +9668,7 @@ share/mysql/test/suite/rpl/r/rpl_report. share/mysql/test/suite/rpl/r/rpl_report_port.result share/mysql/test/suite/rpl/r/rpl_reset_slave_all.result share/mysql/test/suite/rpl/r/rpl_reset_slave_all_thread_safe.result +share/mysql/test/suite/rpl/r/rpl_reset_slave_fail.result share/mysql/test/suite/rpl/r/rpl_rewrite_db_filter.result share/mysql/test/suite/rpl/r/rpl_rewrt_db.result share/mysql/test/suite/rpl/r/rpl_rotate_gtid.result @@ -9696,7 +9800,8 @@ share/mysql/test/suite/rpl/r/rpl_simulat share/mysql/test/suite/rpl/r/rpl_skip_ddl_errors_cli.result share/mysql/test/suite/rpl/r/rpl_skip_error.result share/mysql/test/suite/rpl/r/rpl_skip_error_no_binlog_slave.result -share/mysql/test/suite/rpl/r/rpl_skip_incident.result +share/mysql/test/suite/rpl/r/rpl_skip_incident_error.result +share/mysql/test/suite/rpl/r/rpl_skip_incident_error_cross.result share/mysql/test/suite/rpl/r/rpl_skip_slave_err_warnings.result share/mysql/test/suite/rpl/r/rpl_slave_grp_exec.result share/mysql/test/suite/rpl/r/rpl_slave_load_in.result @@ -9772,7 +9877,6 @@ share/mysql/test/suite/rpl/r/rpl_tmp_tab share/mysql/test/suite/rpl/r/rpl_transaction_before_commit_failure.result share/mysql/test/suite/rpl/r/rpl_transaction_ctx_service.result share/mysql/test/suite/rpl/r/rpl_transaction_write_set_extraction.result -share/mysql/test/suite/rpl/r/rpl_transaction_write_set_extraction_savepoint.result share/mysql/test/suite/rpl/r/rpl_trigger.result share/mysql/test/suite/rpl/r/rpl_trunc_temp.result share/mysql/test/suite/rpl/r/rpl_truncate_2myisam.result @@ -9801,6 +9905,7 @@ share/mysql/test/suite/rpl/r/rpl_wait_fo share/mysql/test/suite/rpl/r/rpl_wait_for_executed_gtid_set_no_timeout.result share/mysql/test/suite/rpl/r/rpl_wait_for_executed_gtid_set_with_sleep.result share/mysql/test/suite/rpl/r/rpl_wait_for_gtid_executed_unknown_uuid.result +share/mysql/test/suite/rpl/r/rpl_xa_gap_lock.result share/mysql/test/suite/rpl/r/rpl_xa_prepare.result share/mysql/test/suite/rpl/r/rpl_xa_survive_crash_debug.result share/mysql/test/suite/rpl/r/rpl_xa_survive_disconnect.result @@ -9874,6 +9979,7 @@ share/mysql/test/suite/rpl/t/rpl_change_ share/mysql/test/suite/rpl/t/rpl_change_master_dbug.test share/mysql/test/suite/rpl/t/rpl_change_master_open_temp_tables.test share/mysql/test/suite/rpl/t/rpl_change_master_relay_log_purge.test +share/mysql/test/suite/rpl/t/rpl_change_master_to_master_delay.test share/mysql/test/suite/rpl/t/rpl_change_master_without_stopping_slave-master.opt share/mysql/test/suite/rpl/t/rpl_change_master_without_stopping_slave-slave.opt share/mysql/test/suite/rpl/t/rpl_change_master_without_stopping_slave.test @@ -9931,6 +10037,7 @@ share/mysql/test/suite/rpl/t/rpl_do_tabl share/mysql/test/suite/rpl/t/rpl_drop.test share/mysql/test/suite/rpl/t/rpl_drop_db.test share/mysql/test/suite/rpl/t/rpl_drop_db_fail.test +share/mysql/test/suite/rpl/t/rpl_drop_scheduled_event.test share/mysql/test/suite/rpl/t/rpl_drop_temp-slave.opt share/mysql/test/suite/rpl/t/rpl_drop_temp.test share/mysql/test/suite/rpl/t/rpl_drop_temp_gtid.test @@ -10019,6 +10126,8 @@ share/mysql/test/suite/rpl/t/rpl_gtid_ig share/mysql/test/suite/rpl/t/rpl_gtid_ignore_table_filter_sensitive.test share/mysql/test/suite/rpl/t/rpl_gtid_loaddata_s-slave.opt share/mysql/test/suite/rpl/t/rpl_gtid_loaddata_s.test +share/mysql/test/suite/rpl/t/rpl_gtid_mixed_rows_and_stmts_tx_isolation_error-slave.opt +share/mysql/test/suite/rpl/t/rpl_gtid_mixed_rows_and_stmts_tx_isolation_error.test share/mysql/test/suite/rpl/t/rpl_gtid_mode.test share/mysql/test/suite/rpl/t/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off-master.opt share/mysql/test/suite/rpl/t/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off-slave.opt @@ -10039,6 +10148,9 @@ share/mysql/test/suite/rpl/t/rpl_gtid_ro share/mysql/test/suite/rpl/t/rpl_gtid_row_event_max_size-slave.opt share/mysql/test/suite/rpl/t/rpl_gtid_row_event_max_size.test share/mysql/test/suite/rpl/t/rpl_gtid_server_sighup.test +share/mysql/test/suite/rpl/t/rpl_gtid_skip_incident_caused_by_insufficient_stmt_cache.test +share/mysql/test/suite/rpl/t/rpl_gtid_skip_incident_caused_by_partially_failed_grant.test +share/mysql/test/suite/rpl/t/rpl_gtid_skip_partial_trx.test share/mysql/test/suite/rpl/t/rpl_gtid_spanned_trx.test share/mysql/test/suite/rpl/t/rpl_gtid_split_statements.test share/mysql/test/suite/rpl/t/rpl_gtid_sql_until_before_after.test @@ -10079,7 +10191,8 @@ share/mysql/test/suite/rpl/t/rpl_ignore_ share/mysql/test/suite/rpl/t/rpl_ignore_table_filter_sensitive.test share/mysql/test/suite/rpl/t/rpl_ignore_table_update-slave.opt share/mysql/test/suite/rpl/t/rpl_ignore_table_update.test -share/mysql/test/suite/rpl/t/rpl_incident.test +share/mysql/test/suite/rpl/t/rpl_inconsistent_error-slave.opt +share/mysql/test/suite/rpl/t/rpl_inconsistent_error.test share/mysql/test/suite/rpl/t/rpl_init_slave-slave.opt share/mysql/test/suite/rpl/t/rpl_init_slave.test share/mysql/test/suite/rpl/t/rpl_init_slave_errors.test @@ -10189,6 +10302,7 @@ share/mysql/test/suite/rpl/t/rpl_mts_log share/mysql/test/suite/rpl/t/rpl_mts_logical_clock_timestamping.test share/mysql/test/suite/rpl/t/rpl_mts_logical_clock_transaction_retry.test share/mysql/test/suite/rpl/t/rpl_mts_logical_clock_wrong_start_pos.test +share/mysql/test/suite/rpl/t/rpl_mts_pending_max.test share/mysql/test/suite/rpl/t/rpl_mts_relay_log_post_crash_recovery-slave.opt share/mysql/test/suite/rpl/t/rpl_mts_relay_log_post_crash_recovery.test share/mysql/test/suite/rpl/t/rpl_mts_relay_log_recovery_on_error-slave.opt @@ -10220,6 +10334,8 @@ share/mysql/test/suite/rpl/t/rpl_multi_s share/mysql/test/suite/rpl/t/rpl_multi_source_channel_name_relay_log.test share/mysql/test/suite/rpl/t/rpl_multi_source_cmd_errors.cnf share/mysql/test/suite/rpl/t/rpl_multi_source_cmd_errors.test +share/mysql/test/suite/rpl/t/rpl_multi_source_corrupt_repository.cnf +share/mysql/test/suite/rpl/t/rpl_multi_source_corrupt_repository.test share/mysql/test/suite/rpl/t/rpl_multi_source_flush_relay_logs.cnf share/mysql/test/suite/rpl/t/rpl_multi_source_flush_relay_logs.test share/mysql/test/suite/rpl/t/rpl_multi_source_init_failure.test @@ -10259,6 +10375,7 @@ share/mysql/test/suite/rpl/t/rpl_mysqlbi share/mysql/test/suite/rpl/t/rpl_name_const.test share/mysql/test/suite/rpl/t/rpl_no_gtid_delete_memory_table_after_start_server.test share/mysql/test/suite/rpl/t/rpl_no_gtid_split_statements.test +share/mysql/test/suite/rpl/t/rpl_nogtid_rollback_on_anonymous_gtid.test share/mysql/test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test share/mysql/test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test share/mysql/test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test @@ -10387,6 +10504,7 @@ share/mysql/test/suite/rpl/t/rpl_report_ share/mysql/test/suite/rpl/t/rpl_report_port.test share/mysql/test/suite/rpl/t/rpl_reset_slave_all.test share/mysql/test/suite/rpl/t/rpl_reset_slave_all_thread_safe.test +share/mysql/test/suite/rpl/t/rpl_reset_slave_fail.test share/mysql/test/suite/rpl/t/rpl_rewrite_db_filter-master.opt share/mysql/test/suite/rpl/t/rpl_rewrite_db_filter-slave.opt share/mysql/test/suite/rpl/t/rpl_rewrite_db_filter.test @@ -10589,9 +10707,10 @@ share/mysql/test/suite/rpl/t/rpl_skip_er share/mysql/test/suite/rpl/t/rpl_skip_error.test share/mysql/test/suite/rpl/t/rpl_skip_error_no_binlog_slave-slave.opt share/mysql/test/suite/rpl/t/rpl_skip_error_no_binlog_slave.test -share/mysql/test/suite/rpl/t/rpl_skip_incident-master.opt -share/mysql/test/suite/rpl/t/rpl_skip_incident-slave.opt -share/mysql/test/suite/rpl/t/rpl_skip_incident.test +share/mysql/test/suite/rpl/t/rpl_skip_incident_error-slave.opt +share/mysql/test/suite/rpl/t/rpl_skip_incident_error.test +share/mysql/test/suite/rpl/t/rpl_skip_incident_error_cross-slave.opt +share/mysql/test/suite/rpl/t/rpl_skip_incident_error_cross.test share/mysql/test/suite/rpl/t/rpl_skip_slave_err_warnings-slave.opt share/mysql/test/suite/rpl/t/rpl_skip_slave_err_warnings.test share/mysql/test/suite/rpl/t/rpl_slave_grp_exec.test @@ -10708,8 +10827,6 @@ share/mysql/test/suite/rpl/t/rpl_transac share/mysql/test/suite/rpl/t/rpl_transaction_write_set_extraction-master.opt share/mysql/test/suite/rpl/t/rpl_transaction_write_set_extraction-slave.opt share/mysql/test/suite/rpl/t/rpl_transaction_write_set_extraction.test -share/mysql/test/suite/rpl/t/rpl_transaction_write_set_extraction_savepoint-master.opt -share/mysql/test/suite/rpl/t/rpl_transaction_write_set_extraction_savepoint.test share/mysql/test/suite/rpl/t/rpl_trigger.test share/mysql/test/suite/rpl/t/rpl_trunc_temp.test share/mysql/test/suite/rpl/t/rpl_truncate_2myisam.test @@ -10744,6 +10861,7 @@ share/mysql/test/suite/rpl/t/rpl_wait_fo share/mysql/test/suite/rpl/t/rpl_wait_for_executed_gtid_set_no_timeout.test share/mysql/test/suite/rpl/t/rpl_wait_for_executed_gtid_set_with_sleep.test share/mysql/test/suite/rpl/t/rpl_wait_for_gtid_executed_unknown_uuid.test +share/mysql/test/suite/rpl/t/rpl_xa_gap_lock.test share/mysql/test/suite/rpl/t/rpl_xa_prepare.test share/mysql/test/suite/rpl/t/rpl_xa_survive_crash_debug.test share/mysql/test/suite/rpl/t/rpl_xa_survive_disconnect.test @@ -12611,8 +12729,8 @@ share/mysql/test/suite/x/r/client_close_ share/mysql/test/suite/x/r/client_session.result share/mysql/test/suite/x/r/connection.result share/mysql/test/suite/x/r/connection_expire.result +share/mysql/test/suite/x/r/connection_expired_certs.result share/mysql/test/suite/x/r/connection_ipv6.result -share/mysql/test/suite/x/r/connection_mysqlxsys.result share/mysql/test/suite/x/r/connection_nonssl.result share/mysql/test/suite/x/r/connection_openssl.result share/mysql/test/suite/x/r/connection_require_secure_transport.result @@ -12644,6 +12762,7 @@ share/mysql/test/suite/x/r/crud_drop_vie share/mysql/test/suite/x/r/crud_find_args.result share/mysql/test/suite/x/r/crud_find_doc_criteria.result share/mysql/test/suite/x/r/crud_find_doc_groupby.result +share/mysql/test/suite/x/r/crud_find_groupby.result share/mysql/test/suite/x/r/crud_insert_args.result share/mysql/test/suite/x/r/crud_insert_cast.result share/mysql/test/suite/x/r/crud_insert_default.result @@ -12711,6 +12830,7 @@ share/mysql/test/suite/x/r/killconnectio share/mysql/test/suite/x/r/message_empty_payload.result share/mysql/test/suite/x/r/message_protobuf_nested.result share/mysql/test/suite/x/r/multiple_resultsets_and_out_params.result +share/mysql/test/suite/x/r/mysql_session_user.result share/mysql/test/suite/x/r/mysqlx_server_var.result share/mysql/test/suite/x/r/notice_warning.result share/mysql/test/suite/x/r/notice_warning_mysqlx.result @@ -12779,9 +12899,10 @@ share/mysql/test/suite/x/t/client_close_ share/mysql/test/suite/x/t/client_session.test share/mysql/test/suite/x/t/connection.test share/mysql/test/suite/x/t/connection_expire.test +share/mysql/test/suite/x/t/connection_expired_certs-master.opt +share/mysql/test/suite/x/t/connection_expired_certs.test share/mysql/test/suite/x/t/connection_ipv6-master.opt share/mysql/test/suite/x/t/connection_ipv6.test -share/mysql/test/suite/x/t/connection_mysqlxsys.test share/mysql/test/suite/x/t/connection_nonssl-master.opt share/mysql/test/suite/x/t/connection_nonssl.test share/mysql/test/suite/x/t/connection_openssl-master.opt @@ -12819,6 +12940,7 @@ share/mysql/test/suite/x/t/crud_drop_vie share/mysql/test/suite/x/t/crud_find_args.test share/mysql/test/suite/x/t/crud_find_doc_criteria.test share/mysql/test/suite/x/t/crud_find_doc_groupby.test +share/mysql/test/suite/x/t/crud_find_groupby.test share/mysql/test/suite/x/t/crud_insert_args.test share/mysql/test/suite/x/t/crud_insert_cast.test share/mysql/test/suite/x/t/crud_insert_default.test @@ -12889,6 +13011,7 @@ share/mysql/test/suite/x/t/message_empty share/mysql/test/suite/x/t/message_protobuf_nested-master.opt share/mysql/test/suite/x/t/message_protobuf_nested.test share/mysql/test/suite/x/t/multiple_resultsets_and_out_params.test +share/mysql/test/suite/x/t/mysql_session_user.test share/mysql/test/suite/x/t/mysqlx_server_var.test share/mysql/test/suite/x/t/notice_warning.test share/mysql/test/suite/x/t/notice_warning_mysqlx.test @@ -12971,6 +13094,7 @@ share/mysql/test/t/auto_increment.test share/mysql/test/t/bench_count_distinct.test share/mysql/test/t/bigint.test share/mysql/test/t/binary.test +share/mysql/test/t/binary_to_hex.test share/mysql/test/t/blackhole.test share/mysql/test/t/blackhole_plugin-master.opt share/mysql/test/t/blackhole_plugin.test @@ -13547,6 +13671,7 @@ share/mysql/test/t/mysql_tzinfo_to_sql_s share/mysql/test/t/mysql_upgrade.test share/mysql/test/t/mysql_upgrade_slave_master_info.test share/mysql/test/t/mysql_upgrade_ssl.test +share/mysql/test/t/mysql_upgrade_with_session_user.test share/mysql/test/t/mysqladmin.test share/mysql/test/t/mysqlbinlog-master.opt share/mysql/test/t/mysqlbinlog.test @@ -13839,6 +13964,7 @@ share/mysql/test/t/shm_server_restart-ma share/mysql/test/t/shm_server_restart.test share/mysql/test/t/show_check-master.opt share/mysql/test/t/show_check.test +share/mysql/test/t/show_processlist_state.test share/mysql/test/t/show_profile.test share/mysql/test/t/show_variables.test share/mysql/test/t/shutdown.test Added files: Index: pkgsrc/databases/mysql57-client/patches/patch-mysys_my__symlink.c diff -u /dev/null pkgsrc/databases/mysql57-client/patches/patch-mysys_my__symlink.c:1.1.2.2 --- /dev/null Sun Jul 30 04:57:58 2017 +++ pkgsrc/databases/mysql57-client/patches/patch-mysys_my__symlink.c Sun Jul 30 04:57:58 2017 @@ -0,0 +1,14 @@ +$NetBSD: patch-mysys_my__symlink.c,v 1.1.2.2 2017/07/30 04:57:58 spz Exp $ + +Add missing include, so MY_STAT gets defined. + +--- mysys/my_symlink.c.orig 2017-07-19 17:59:04.500183903 +0000 ++++ mysys/my_symlink.c +@@ -15,6 +15,7 @@ + + #include "mysys_priv.h" + #include "my_sys.h" ++#include "my_dir.h" + #include "mysys_err.h" + #include + #include --_----------=_1501390678153420--