Pullup ticket #6466 - requested by taca

databases/mysql57-client: security fix

Revisions pulled up:
- databases/mysql57-client/Makefile.common                      1.33-1.34
- databases/mysql57-client/PLIST                                1.21
- databases/mysql57-client/distinfo                             1.41-1.42
- databases/mysql57-client/patches/patch-cmake_build__configurations_compiler__options.cmake 1.1
- databases/mysql57-client/patches/patch-mysys_kqueue__timers.c 1.2
- databases/mysql57-client/patches/patch-sql_locks_shared__spin__lock.cc 1.2
- databases/mysql57-server/PLIST                                1.21

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Wed Apr 21 13:26:55 UTC 2021

   Modified Files:
   	pkgsrc/databases/mysql57-client: Makefile.common PLIST distinfo
   	pkgsrc/databases/mysql57-client/patches: patch-mysys_kqueue__timers.c
   	    patch-sql_locks_shared__spin__lock.cc
   	pkgsrc/databases/mysql57-server: PLIST

   Log Message:
   mysql57: updated to 5.7.34

   Changes in MySQL 5.7.34 (2021-04-20, General Availability)

   Configuration Notes

   The CMAKE_BUILD_TYPE CMake option now supports a Release build type, which is like the RelWithDebInfo build type but omits debugging information to reduce the build size.

   Packaging Notes

   The bundled libedit library was upgraded to version 20190324-3.1.

   Binary packages that include curl rather than linking to the system curl library have been upgraded to use curl 7.74.0.

   Security Notes

   The linked OpenSSL library for MySQL Server has been updated to version 1.1.1k. Issues fixed in the new OpenSSL version are described at https://www.openssl.org/news/cl111.txt and https://www.openssl.org/news/vulnerabilities.html.

   Functionality Added or Changed

   Microsoft Windows: The named_pipe_full_access_group system variable now defaults to an empty string (''), making named pipe connections secure. Previously, '*everyone*' was the default value. A valid Windows local group name may be substituted.

   Bugs Fixed

   InnoDB: The introduction of sharded rw_lock_stats counters in MySQL 5.7 caused a regression in CPU cache efficiency. To address this issue in MySQL 5.7, the sharding method was changed. For optimal performance, the rw_lock_stats counter is removed in MySQL 8.0.

   InnoDB: A delete operation on a parent table that initiated a cascading update on a child table with an indexed virtual column and indexed foreign key constraint column caused a virtual column corruption.

   InnoDB: An adaptive hash index (AHI) latch was held in shared mode by a thread truncating a large table, causing mutex waits for other threads. The AHI latch was not required and has been removed.

   InnoDB: The open and close sequence for table share instances (m_share objects) and dictionary table instances was modified to prevent accessing old m_share objects that could point to stale dictionary indexes.

   Thanks to Yuxiang Jiang for the contribution.

   InnoDB: An online ALTER TABLE operation failed with an “Incorrect key file for table” error due to an unnecessary encryption status check that was performed when reading online DDL row logs.

   Replication: If all previous binary log files were purged at startup because their retention period had expired, the new binary log file contained an empty Previous_gtids event, which could cause errors in replication. The order of initialization has now been changed so that previous binary log files are only purged after the previous GTID set has been written to the new binary log file that is created at startup.

   Replication: An assertion was raised in debug builds relating to lost GTIDs if binary log files were removed at startup because their retention period had expired.

   Replication: A deadlock could occur if the binary log file was rotated while system variables were being updated and read by different clients.

   Replication: The output of a SHOW PROCESSLIST statement for a replica’s SQL thread sometimes showed the last query as currently being applied when the replica was actually caught up.

   A query string was displayed before it had been rewritten.

   For builds compiled using the libedit library, if the mysql client was invoked with the --default-character-set=utf8 option, libedit rejected input of multibyte characters.

   On Windows, large result sets could cause the mysql client to exit unexpectedly.

   Improper locking on an internal queue could cause mysqlpump to exit unexpectedly.

   It is now possible to use START REPLICA SQL_THREAD and STOP REPLICA SQL_THREAD statements for the group_replication_applier channel when Group Replication is stopped. This enables an operator to apply any remaining unapplied transactions on a server that left the group, without having to rejoin the server to the group.

   When the mysql client was used in batch mode, its parser could be confused by USE followed by DROP DATABASE when the USE database name was quoted.

   While optimizing the ORDER BY clause of a subquery there was a possibility of cleaning up a subquery tree referenced in the outer SELECT, which could lead to a premature exit.

   A malformed name in the mysql.func system table could cause unexpected server behavior.

   Sessions could disable their own auditing.

   Mishandling of stored program local variables could lead to unexpected server behavior.

   Uninstalling a plugin could affect subsequent execution of prepared statements.

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Thu Apr 29 16:50:33 UTC 2021

   Modified Files:
   	pkgsrc/databases/mysql57-client: Makefile.common distinfo
   Added Files:
   	pkgsrc/databases/mysql57-client/patches:
   	    patch-cmake_build__configurations_compiler__options.cmake

   Log Message:
   mysql57: fix building with GCC

7 files changed, 60 insertions, 28 deletions

diff --git a/databases/mysql57-client/Makefile.common b/databases/mysql57-client/Makefile.common
index 9578ef3ad18..d2614aca1f7 100644
--- a/databases/mysql57-client/Makefile.common
+++ b/databases/mysql57-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.32 2021/02/19 10:19:56 tnn Exp $
+# $NetBSD: Makefile.common,v 1.32.2.1 2021/05/31 13:28:52 bsiegert Exp $
 #
 # used by databases/mysql57-client/Makefile
 # used by databases/mysql57-server/Makefile
 
-DISTNAME=	mysql-5.7.33
+DISTNAME=	mysql-5.7.34
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.7/}
 
@@ -66,7 +66,7 @@ CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 
 CMAKE_ARGS+=	-DWITH_BOOST="system"
 CMAKE_ARGS+=	-DWITH_EDITLINE="system"
-CMAKE_ARGS+=	-DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editline:Q}/${BUILDLINK_INCDIRS.editline}
+CMAKE_ARGS+=	-DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editline}/${BUILDLINK_INCDIRS.editline}
 CMAKE_ARGS+=	-DWITH_LIBEVENT="system"
 CMAKE_ARGS+=	-DWITH_LZ4="system"
 CMAKE_ARGS+=	-DWITH_SSL="system"
diff --git a/databases/mysql57-client/PLIST b/databases/mysql57-client/PLIST
index d921969c9d9..548d0a80b19 100644
--- a/databases/mysql57-client/PLIST
+++ b/databases/mysql57-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2021/02/04 20:26:10 adam Exp $
+@comment $NetBSD: PLIST,v 1.20.2.1 2021/05/31 13:28:52 bsiegert 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.20
+lib/libmysqlclient.so.20.3.21
 lib/pkgconfig/mysqlclient.pc
 man/man1/comp_err.1
 man/man1/innochecksum.1
diff --git a/databases/mysql57-client/distinfo b/databases/mysql57-client/distinfo
index d67ba8610d5..09b9cd04473 100644
--- a/databases/mysql57-client/distinfo
+++ b/databases/mysql57-client/distinfo
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.40 2021/02/04 20:26:10 adam Exp $
+$NetBSD: distinfo,v 1.40.2.1 2021/05/31 13:28:52 bsiegert Exp $
 
-SHA1 (mysql-5.7.33.tar.gz) = 08d288b77f5450e920272738232c7c20be891772
-RMD160 (mysql-5.7.33.tar.gz) = b041f96c892083f03228eb2e4a24f05cce452f3f
-SHA512 (mysql-5.7.33.tar.gz) = 62349fdf2c2d9078ead383f150ccf52d719df9bb475e90910882595194f8038eb1b0333b2f5f153972a0b7309eab369a9f7d5178f2d71a12816e634df2be059b
-Size (mysql-5.7.33.tar.gz) = 56179381 bytes
+SHA1 (mysql-5.7.34.tar.gz) = d1842baea3abc4b4cd684186e88b123d854d4ed7
+RMD160 (mysql-5.7.34.tar.gz) = f23902a074cb7bcd05dc7ef8c04186021c4d689c
+SHA512 (mysql-5.7.34.tar.gz) = a59b27e56963a8b57f8e3d89890d7ea0e4e157f81f274670ab0416d5fccb0da1b09b7702b58c3c9de726ee03bd1b84a6d2bf309e1e3e3fba285361e5bc3d059c
+Size (mysql-5.7.34.tar.gz) = 56150251 bytes
 SHA1 (patch-CMakeLists.txt) = 1409a98380c999c6973fa3106dc35684b7c3b3cc
 SHA1 (patch-client_CMakeLists.txt) = 4af2fb3f3d05a66a9ee89f3653e2fcccadfa5f79
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
 SHA1 (patch-cmake_boost.cmake) = ecf03b396c57c69e0d251497e7217e47632613c2
+SHA1 (patch-cmake_build__configurations_compiler__options.cmake) = 999110815237c53a69c74c42e66c45df83cbf355
 SHA1 (patch-cmake_build__configurations_mysql__release.cmake) = 7a1fb8c686f187db8fd9d8ad203c1f764d6e55a6
 SHA1 (patch-cmake_curl.cmake) = 08ff31eb8de6b94a46ff90edb6df66a61a94fd9d
 SHA1 (patch-cmake_ldap.cmake) = 9bdc3c311330852286838e6159295ecc5fbdc0ea
@@ -24,7 +25,7 @@ SHA1 (patch-include_my__thread__os__id.h) = a51861b791086a0eeb9cb4d64892c5033da8
 SHA1 (patch-libmysql_CMakeLists.txt) = 13b3aa65a82e0e94f097d0092e46b0b9558fdfc6
 SHA1 (patch-mysql-test_CMakeLists.txt) = 8a8e846792077101a01731c4577c37161f70264d
 SHA1 (patch-mysys__ssl_CMakeLists.txt) = 753c4f5ed1884e1a3c79d645af6d5ffd027ff7dd
-SHA1 (patch-mysys_kqueue__timers.c) = 836803e9c7353b813bc22a5b69cc263dea384c9b
+SHA1 (patch-mysys_kqueue__timers.c) = 709c1551b5c62ea5a4441f935a7b0eb67d96074b
 SHA1 (patch-mysys_mf__iocache2.c) = 0c5047cbd4b9fc09d9e5b18bcae324d794fe833d
 SHA1 (patch-mysys_my__symlink.c) = 23b57cd5922357d0bc72f5c15100a9fe1f89cfb2
 SHA1 (patch-mysys_stacktrace.c) = 3e0794f544f0e35f44a694330885478247657842
@@ -38,7 +39,7 @@ SHA1 (patch-scripts_mysqld_safe.sh) = 0784314227657aa0bc3f4a0b4e21c173a86fa94b
 SHA1 (patch-sql_CMakeLists.txt) = 697add15adb66bf55cf561a6e43e0bf514d1e068
 SHA1 (patch-sql_conn__handler_socket__connection.cc) = 12cf83e061edbe59eb073037b1036903b7ba4b00
 SHA1 (patch-sql_item__geofunc__internal.cc) = 752862c3a30231e694e508ced1a215a610649fc6
-SHA1 (patch-sql_locks_shared__spin__lock.cc) = 0fcdc9db76bb8a25c083e124334245f53cee871d
+SHA1 (patch-sql_locks_shared__spin__lock.cc) = 32777eb07d42a3c5c7cfc331eea4d8218cabe486
 SHA1 (patch-sql_log_event.h) = 311dc7fb04ea832df229dc2a28bcfbf263670ebf
 SHA1 (patch-sql_sys__vars.cc) = 202b8756c20549393d0e2a14952e1f060037b88a
 SHA1 (patch-storage_archive_CMakeLists.txt) = 4cf5ed97a226a3844e184c46958b5202eefb9dd5
diff --git a/databases/mysql57-client/patches/patch-cmake_build__configurations_compiler__options.cmake b/databases/mysql57-client/patches/patch-cmake_build__configurations_compiler__options.cmake
new file mode 100644
index 00000000000..622f0e33b73
--- /dev/null
+++ b/databases/mysql57-client/patches/patch-cmake_build__configurations_compiler__options.cmake
@@ -0,0 +1,24 @@
+$NetBSD: patch-cmake_build__configurations_compiler__options.cmake,v 1.1.2.2 2021/05/31 13:28:52 bsiegert Exp $
+
+Require C++14.
+
+--- cmake/build_configurations/compiler_options.cmake.orig	2021-04-29 13:13:28.501383898 +0000
++++ cmake/build_configurations/compiler_options.cmake
+@@ -73,7 +73,7 @@ IF(UNIX)  
+     EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
+                     OUTPUT_VARIABLE GXX_VERSION)
+     IF(GXX_VERSION VERSION_EQUAL 6.0 OR GXX_VERSION VERSION_GREATER 6.0)
+-      STRING_PREPEND(COMMON_CXX_FLAGS "-std=gnu++03 ")
++      STRING_PREPEND(COMMON_CXX_FLAGS "-std=gnu++14 ")
+     ENDIF()
+     # Disable inline optimizations for valgrind testing to avoid false positives
+     IF(WITH_VALGRIND)
+@@ -112,7 +112,7 @@ IF(UNIX)  
+     IF(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 6.0 OR
+         CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0)
+       IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+-        STRING_PREPEND(COMMON_CXX_FLAGS "-std=gnu++03 ")
++        STRING_PREPEND(COMMON_CXX_FLAGS "-std=gnu++14 ")
+       ENDIF()
+     ENDIF()
+     IF(NOT DISABLE_SHARED)
diff --git a/databases/mysql57-client/patches/patch-mysys_kqueue__timers.c b/databases/mysql57-client/patches/patch-mysys_kqueue__timers.c
index c9dd668eb8b..a2f48fd2df4 100644
--- a/databases/mysql57-client/patches/patch-mysys_kqueue__timers.c
+++ b/databases/mysql57-client/patches/patch-mysys_kqueue__timers.c
@@ -1,11 +1,11 @@
-$NetBSD: patch-mysys_kqueue__timers.c,v 1.1 2016/09/16 06:49:11 adam Exp $
+$NetBSD: patch-mysys_kqueue__timers.c,v 1.1.38.1 2021/05/31 13:28:52 bsiegert Exp $
 
 Fix for systems which do not define EVFILT_USER.
 
---- mysys/kqueue_timers.c.orig	2016-09-15 11:33:26.000000000 +0000
+--- mysys/kqueue_timers.c.orig	2021-03-26 06:58:52.000000000 +0000
 +++ mysys/kqueue_timers.c
-@@ -67,8 +67,10 @@ timer_notify_thread_func(void *arg MY_AT
-       DBUG_ASSERT(timer->id == kev.ident);
+@@ -74,8 +74,10 @@ timer_notify_thread_func(void *arg MY_AT
+       assert(timer->id == kev.ident);
        timer->notify_function(timer);
      }
 +#ifdef EVFILT_USER
@@ -15,7 +15,7 @@ Fix for systems which do not define EVFILT_USER.
    }
  
    close(kq_fd);
-@@ -89,7 +91,9 @@ start_helper_thread(void)
+@@ -96,7 +98,9 @@ start_helper_thread(void)
  {
    struct kevent kev;
  
@@ -25,7 +25,7 @@ Fix for systems which do not define EVFILT_USER.
  
    if (kevent(kq_fd, &kev, 1, NULL, 0, NULL) < 0)
    {
-@@ -143,7 +147,9 @@ my_timer_deinitialize(void)
+@@ -150,7 +154,9 @@ my_timer_deinitialize(void)
  {
    struct kevent kev;
  
diff --git a/databases/mysql57-client/patches/patch-sql_locks_shared__spin__lock.cc b/databases/mysql57-client/patches/patch-sql_locks_shared__spin__lock.cc
index 8f52921d465..9189e33f228 100644
--- a/databases/mysql57-client/patches/patch-sql_locks_shared__spin__lock.cc
+++ b/databases/mysql57-client/patches/patch-sql_locks_shared__spin__lock.cc
@@ -1,19 +1,16 @@
-$NetBSD: patch-sql_locks_shared__spin__lock.cc,v 1.1 2021/02/04 20:26:10 adam Exp $
+$NetBSD: patch-sql_locks_shared__spin__lock.cc,v 1.1.2.1 2021/05/31 13:28:52 bsiegert Exp $
 
 Fix buidling on Darwin.
 https://bugs.mysql.com/bug.php?id=102288
 
---- sql/locks/shared_spin_lock.cc.orig	2021-02-04 09:40:46.000000000 +0000
+--- sql/locks/shared_spin_lock.cc.orig	2021-03-26 06:58:52.000000000 +0000
 +++ sql/locks/shared_spin_lock.cc
-@@ -239,7 +239,11 @@ lock::Shared_spin_lock &lock::Shared_spi
+@@ -239,7 +239,7 @@ lock::Shared_spin_lock &lock::Shared_spi
    {
      this->spin_exclusive_lock();
    }
+-#if defined(__APPLE__)
 +#if defined(__APPLE__) || defined(__NetBSD__)
-+  my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast<int64>(self));
-+#else
+   my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast<int64>(self));
+ #else
    my_atomic_store64(&this->m_exclusive_owner, self);
-+#endif
-   return (*this);
- }
- 
diff --git a/databases/mysql57-server/PLIST b/databases/mysql57-server/PLIST
index 83244d0fe76..9ed9cc76af4 100644
--- a/databases/mysql57-server/PLIST
+++ b/databases/mysql57-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2021/02/04 20:26:10 adam Exp $
+@comment $NetBSD: PLIST,v 1.20.2.1 2021/05/31 13:28:52 bsiegert Exp $
 bin/innochecksum
 bin/lz4_decompress
 bin/my_print_defaults
@@ -898,6 +898,7 @@ share/mysql/test/include/start_slave_sql.inc
 share/mysql/test/include/start_transaction_high_prio.inc
 share/mysql/test/include/stop_dump_threads.inc
 share/mysql/test/include/stop_group_replication.inc
+share/mysql/test/include/stop_mysqld.inc
 share/mysql/test/include/stop_slave.inc
 share/mysql/test/include/stop_slave_io.inc
 share/mysql/test/include/stop_slave_sql.inc
@@ -1555,6 +1556,7 @@ share/mysql/test/r/myisampack.result
 share/mysql/test/r/mysql-bug41486.result
 share/mysql/test/r/mysql-bug45236.result
 share/mysql/test/r/mysql.result
+share/mysql/test/r/mysql_batch_mode.result
 share/mysql/test/r/mysql_binary_mode.result
 share/mysql/test/r/mysql_client_test.result
 share/mysql/test/r/mysql_client_test_embedded.result
@@ -2482,6 +2484,7 @@ 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_purge_binlog_at_startup.result
 share/mysql/test/suite/binlog/r/binlog_gtid_rbr_only_flag.result
 share/mysql/test/suite/binlog/r/binlog_gtid_reset_consistency_violation_on_fail.result
 share/mysql/test/suite/binlog/r/binlog_gtid_row_ctype_ucs.result
@@ -2684,6 +2687,7 @@ 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_purge_binlog_at_startup.test
 share/mysql/test/suite/binlog/t/binlog_gtid_rbr_only_flag.test
 share/mysql/test/suite/binlog/t/binlog_gtid_reset_consistency_violation_on_fail.test
 share/mysql/test/suite/binlog/t/binlog_gtid_row_ctype_ucs.test
@@ -5378,6 +5382,7 @@ share/mysql/test/suite/innodb/r/innodb_prefix_index_restart_server.result
 share/mysql/test/suite/innodb/r/innodb_rename_index.result
 share/mysql/test/suite/innodb/r/innodb_rename_index_err.result
 share/mysql/test/suite/innodb/r/innodb_replace.result
+share/mysql/test/suite/innodb/r/innodb_row_log_read.result
 share/mysql/test/suite/innodb/r/innodb_stats.result
 share/mysql/test/suite/innodb/r/innodb_stats_auto_recalc.result
 share/mysql/test/suite/innodb/r/innodb_stats_auto_recalc_ddl.result
@@ -5797,6 +5802,7 @@ share/mysql/test/suite/innodb/t/innodb_prefix_index_restart_server.test
 share/mysql/test/suite/innodb/t/innodb_rename_index.test
 share/mysql/test/suite/innodb/t/innodb_rename_index_err.test
 share/mysql/test/suite/innodb/t/innodb_replace.test
+share/mysql/test/suite/innodb/t/innodb_row_log_read.test
 share/mysql/test/suite/innodb/t/innodb_stats.test
 share/mysql/test/suite/innodb/t/innodb_stats_auto_recalc.test
 share/mysql/test/suite/innodb/t/innodb_stats_auto_recalc_ddl.test
@@ -10140,6 +10146,7 @@ share/mysql/test/suite/rpl/r/rpl_set_null_innodb.result
 share/mysql/test/suite/rpl/r/rpl_set_null_myisam.result
 share/mysql/test/suite/rpl/r/rpl_show_errors.result
 share/mysql/test/suite/rpl/r/rpl_show_master_info_file.result
+share/mysql/test/suite/rpl/r/rpl_show_processlist_info.result
 share/mysql/test/suite/rpl/r/rpl_show_relaylog_events.result
 share/mysql/test/suite/rpl/r/rpl_show_slave_hosts.result
 share/mysql/test/suite/rpl/r/rpl_show_slave_running.result
@@ -10708,6 +10715,7 @@ share/mysql/test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_deadlock_error-
 share/mysql/test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_deadlock_error.test
 share/mysql/test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_error-slave.opt
 share/mysql/test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_error.test
+share/mysql/test/suite/rpl/t/rpl_mts_spco_deadlock_hang_on_non_temp_error-slave.opt
 share/mysql/test/suite/rpl/t/rpl_mts_spco_deadlock_hang_on_non_temp_error.test
 share/mysql/test/suite/rpl/t/rpl_mts_spco_deadlock_slave_trans_retries_hang.test
 share/mysql/test/suite/rpl/t/rpl_mts_stop_slave-slave.opt
@@ -11119,6 +11127,7 @@ share/mysql/test/suite/rpl/t/rpl_set_null_myisam.test
 share/mysql/test/suite/rpl/t/rpl_show_errors.test
 share/mysql/test/suite/rpl/t/rpl_show_master_info_file-master.opt
 share/mysql/test/suite/rpl/t/rpl_show_master_info_file.test
+share/mysql/test/suite/rpl/t/rpl_show_processlist_info.test
 share/mysql/test/suite/rpl/t/rpl_show_relaylog_events.test
 share/mysql/test/suite/rpl/t/rpl_show_slave_hosts.cnf
 share/mysql/test/suite/rpl/t/rpl_show_slave_hosts.test
@@ -14104,6 +14113,7 @@ share/mysql/test/t/myisampack.test
 share/mysql/test/t/mysql-bug41486.test
 share/mysql/test/t/mysql-bug45236.test
 share/mysql/test/t/mysql.test
+share/mysql/test/t/mysql_batch_mode.test
 share/mysql/test/t/mysql_binary_mode.test
 share/mysql/test/t/mysql_client_test-master.opt
 share/mysql/test/t/mysql_client_test.test