Tue Apr 11 20:21:03 2017 UTC ()
Changes 5.6.36:
* Windows builds now use the default runtime libraries (builds use the /MD flag).
* CMake support was added for compiling with Developer Studio 12.6.
MySQL failed to compile if -DENABLE_DEBUG_SYNC=OFF AND -DWITH_DEBUG=ON were both given. The ENABLE_DEBUG_SYNC option has been removed and enabling WITH_DEBUG enables Debug Sync.
* Changes in RPM package structure require a larger set of packages to be removed to install MySQL Server cleanly.
* To avoid potential race conditions, Debian packages now use the GNU install utility rather than a combination of mkdir, touch, and chown.
* CMake-generated packaging for Debian/Ubuntu packages was refactored for improved maintainability. The change includes updated logic for correctly replacing native distribution packaging in Debian and Ubuntu.
* Reminder: MySQL 5.6 requires the Microsoft Visual C++ 2010 Redistributable Package to run on Windows platforms. Users should make sure the package has been installed on the system before starting the server. The package is available at the Microsoft Download Center.
* The linked OpenSSL library for the MySQL Commercial Server has been updated to version 1.0.2k. For a description of issues fixed in this version, see http://www.openssl.org/news/vulnerabilities.html.
* The mysql_options() C API function now supports a MYSQL_OPT_SSL_MODE option.


(adam)
diff -r1.38 -r1.39 pkgsrc/databases/mysql56-client/Makefile.common
diff -r1.41 -r1.42 pkgsrc/databases/mysql56-client/distinfo
diff -r1.1 -r1.2 pkgsrc/databases/mysql56-client/patches/patch-cmake_os_SunOS.cmake
diff -r1.28 -r1.29 pkgsrc/databases/mysql56-server/PLIST
cvs diff -r1.38 -r1.39 pkgsrc/databases/mysql56-client/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-client/Makefile.common 2016/12/12 19:21:33 1.38
+++ pkgsrc/databases/mysql56-client/Makefile.common 2017/04/11 20:21:02 1.39
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile.common,v 1.38 2016/12/12 19:21:33 adam Exp $ 1# $NetBSD: Makefile.common,v 1.39 2017/04/11 20:21:02 adam 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.35 6DISTNAME= mysql-5.6.36
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.6/} 8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.6/}
9 9
10MAINTAINER?= pkgsrc-users@NetBSD.org 10MAINTAINER?= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.mysql.com/ 11HOMEPAGE= http://www.mysql.com/
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql56-client/distinfo 14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql56-client/distinfo
15PATCHDIR?= ${.CURDIR}/../../databases/mysql56-client/patches 15PATCHDIR?= ${.CURDIR}/../../databases/mysql56-client/patches
16 16
17USE_CMAKE= yes 17USE_CMAKE= yes
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_TOOLS+= bash gmake perl:run 19USE_TOOLS+= bash gmake perl:run
cvs diff -r1.41 -r1.42 pkgsrc/databases/mysql56-client/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-client/distinfo 2016/12/16 17:55:48 1.41
+++ pkgsrc/databases/mysql56-client/distinfo 2017/04/11 20:21:02 1.42
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1$NetBSD: distinfo,v 1.41 2016/12/16 17:55:48 jperkin Exp $ 1$NetBSD: distinfo,v 1.42 2017/04/11 20:21:02 adam Exp $
2 2
3SHA1 (mysql-5.6.35.tar.gz) = a971f01d711addd87c860fb534d51139a73d5319 3SHA1 (mysql-5.6.36.tar.gz) = 6a94c75880c249cb2ec832bfcd3786944b0e7df5
4RMD160 (mysql-5.6.35.tar.gz) = 3a54baba27b940b5c18787a6d213e1cc6530ea28 4RMD160 (mysql-5.6.36.tar.gz) = 9e02b6607e7d855db6afee2f80505d29dfcd454b
5SHA512 (mysql-5.6.35.tar.gz) = 106c4b05c52cd2bb5378376e4a453aeb55eda0adce527862c435068597c3e60f44e3c64476011befefd688e6fdf30f2245e28320d57d9fccbb2415d87498e7f2 5SHA512 (mysql-5.6.36.tar.gz) = b3e3bcb1d1e913994f274f4c6dc72c77f1f52b132389e784c675d1720b5913788ce035f045b99ef3754d1b257db55e8300b5c7622ec79c33afafec5968801c18
6Size (mysql-5.6.35.tar.gz) = 32167628 bytes 6Size (mysql-5.6.36.tar.gz) = 32192348 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) = 1ef310e6395653be3219044fc2ea58977a1b0ce3 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
20SHA1 (patch-cmake_ssl.cmake) = a5a25b00010c6586e5a3e099975ddabe369d4247 20SHA1 (patch-cmake_ssl.cmake) = a5a25b00010c6586e5a3e099975ddabe369d4247
21SHA1 (patch-include_CMakeLists.txt) = 49d351a958e63c69ad8bfe5c50961fe3751e86c4 21SHA1 (patch-include_CMakeLists.txt) = 49d351a958e63c69ad8bfe5c50961fe3751e86c4
22SHA1 (patch-include_my__global.h) = 843b9527faf880eee59cf02239ba601f5985ddfb 22SHA1 (patch-include_my__global.h) = 843b9527faf880eee59cf02239ba601f5985ddfb
23SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5 23SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5
24SHA1 (patch-include_my_net.h) = b08aa36921efd023f9ecaac4cd3fb8a16d200abd 24SHA1 (patch-include_my_net.h) = b08aa36921efd023f9ecaac4cd3fb8a16d200abd
25SHA1 (patch-include_my_pthread.h) = ff3bf1fddd04edd7804d810f79de64387464b5ca 25SHA1 (patch-include_my_pthread.h) = ff3bf1fddd04edd7804d810f79de64387464b5ca
26SHA1 (patch-libmysql_CMakeLists.txt) = 229044de6d11b26ee99b25be99b628a9f146b795 26SHA1 (patch-libmysql_CMakeLists.txt) = 229044de6d11b26ee99b25be99b628a9f146b795
27SHA1 (patch-mysql-test_CMakeLists.txt) = b7dd562d55678b13ac487aa0ee59bf2551af1f9d 27SHA1 (patch-mysql-test_CMakeLists.txt) = b7dd562d55678b13ac487aa0ee59bf2551af1f9d
28SHA1 (patch-mysys__ssl_CMakeLists.txt) = e50bad459520be78ea2d5c4d0699cda8c1141884 28SHA1 (patch-mysys__ssl_CMakeLists.txt) = e50bad459520be78ea2d5c4d0699cda8c1141884
29SHA1 (patch-mysys_stacktrace.c) = 27ddd012c9ca299cfe2b9935b9f99fe603415e7e 29SHA1 (patch-mysys_stacktrace.c) = 27ddd012c9ca299cfe2b9935b9f99fe603415e7e
30SHA1 (patch-scripts_CMakeLists.txt) = 5b44d2d137e3e64474d663a8faab5b5f289f4cf5 30SHA1 (patch-scripts_CMakeLists.txt) = 5b44d2d137e3e64474d663a8faab5b5f289f4cf5
cvs diff -r1.1 -r1.2 pkgsrc/databases/mysql56-client/patches/patch-cmake_os_SunOS.cmake (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-client/patches/patch-cmake_os_SunOS.cmake 2016/12/16 17:55:48 1.1
+++ pkgsrc/databases/mysql56-client/patches/patch-cmake_os_SunOS.cmake 2017/04/11 20:21:02 1.2
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-cmake_os_SunOS.cmake,v 1.1 2016/12/16 17:55:48 jperkin Exp $ 1$NetBSD: patch-cmake_os_SunOS.cmake,v 1.2 2017/04/11 20:21:02 adam Exp $
2 2
3Backport section from MySQL 5.7 to fix SunOS/gcc. 3Backport section from MySQL 5.7 to fix SunOS/gcc.
4 4
5--- cmake/os/SunOS.cmake.orig 2016-11-28 13:36:22.000000000 +0000 5--- cmake/os/SunOS.cmake.orig 2017-03-18 06:43:12.000000000 +0000
6+++ cmake/os/SunOS.cmake 6+++ cmake/os/SunOS.cmake
7@@ -19,7 +19,13 @@ INCLUDE(CheckCSourceCompiles) 7@@ -19,7 +19,13 @@ INCLUDE(CheckCSourceCompiles)
8  8
9 # We require SunStudio 12u2 (CC 5.11) 9 # We require SunStudio 12u2 (CC 5.11)
10 IF(NOT FORCE_UNSUPPORTED_COMPILER) 10 IF(NOT FORCE_UNSUPPORTED_COMPILER)
11- IF(CMAKE_C_COMPILER_ID MATCHES "SunPro") 11- IF(CMAKE_C_COMPILER_ID MATCHES "SunPro")
12+ IF(CMAKE_COMPILER_IS_GNUCC) 12+ IF(CMAKE_COMPILER_IS_GNUCC)
13+ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion 13+ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
14+ OUTPUT_VARIABLE GCC_VERSION) 14+ OUTPUT_VARIABLE GCC_VERSION)
15+ IF(GCC_VERSION VERSION_LESS 4.4) 15+ IF(GCC_VERSION VERSION_LESS 4.4)
16+ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!") 16+ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
17+ ENDIF() 17+ ENDIF()
18+ ELSEIF(CMAKE_C_COMPILER_ID MATCHES "SunPro") 18+ ELSEIF(CMAKE_C_COMPILER_ID MATCHES "SunPro")
19 # CC -V yields 19 # CC -V yields
 20 # CC: Studio 12.6 Sun C++ 5.15 SunOS_sparc Beta 2016/12/19
20 # CC: Studio 12.5 Sun C++ 5.14 SunOS_sparc Dodona 2016/04/04 21 # CC: Studio 12.5 Sun C++ 5.14 SunOS_sparc Dodona 2016/04/04
21 # CC: Sun C++ 5.13 SunOS_sparc Beta 2014/03/11 
cvs diff -r1.28 -r1.29 pkgsrc/databases/mysql56-server/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-server/PLIST 2016/12/12 19:21:33 1.28
+++ pkgsrc/databases/mysql56-server/PLIST 2017/04/11 20:21:02 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.28 2016/12/12 19:21:33 adam Exp $ 1@comment $NetBSD: PLIST,v 1.29 2017/04/11 20:21:02 adam 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
@@ -3504,28 +3504,30 @@ share/mysql/test/suite/innodb/include/in @@ -3504,28 +3504,30 @@ share/mysql/test/suite/innodb/include/in
3504share/mysql/test/suite/innodb/include/innodb_stats.inc 3504share/mysql/test/suite/innodb/include/innodb_stats.inc
3505share/mysql/test/suite/innodb/include/innodb_stats_table_flag.inc 3505share/mysql/test/suite/innodb/include/innodb_stats_table_flag.inc
3506share/mysql/test/suite/innodb/include/innodb_stats_table_flag_analyze.inc 3506share/mysql/test/suite/innodb/include/innodb_stats_table_flag_analyze.inc
3507share/mysql/test/suite/innodb/r/add_foreign_key.result 3507share/mysql/test/suite/innodb/r/add_foreign_key.result
3508share/mysql/test/suite/innodb/r/alter_rename_existing.result 3508share/mysql/test/suite/innodb/r/alter_rename_existing.result
3509share/mysql/test/suite/innodb/r/analyze_table.result 3509share/mysql/test/suite/innodb/r/analyze_table.result
3510share/mysql/test/suite/innodb/r/autoinc_debug.result 3510share/mysql/test/suite/innodb/r/autoinc_debug.result
3511share/mysql/test/suite/innodb/r/blob-update-debug.result 3511share/mysql/test/suite/innodb/r/blob-update-debug.result
3512share/mysql/test/suite/innodb/r/blob_redo.result 3512share/mysql/test/suite/innodb/r/blob_redo.result
3513share/mysql/test/suite/innodb/r/checksum.result 3513share/mysql/test/suite/innodb/r/checksum.result
3514share/mysql/test/suite/innodb/r/create-index.result 3514share/mysql/test/suite/innodb/r/create-index.result
3515share/mysql/test/suite/innodb/r/create_isl_with_direct.result 3515share/mysql/test/suite/innodb/r/create_isl_with_direct.result
3516share/mysql/test/suite/innodb/r/dropdb.result 3516share/mysql/test/suite/innodb/r/dropdb.result
 3517share/mysql/test/suite/innodb/r/end_range_check.result
3517share/mysql/test/suite/innodb/r/flush-hang.result 3518share/mysql/test/suite/innodb/r/flush-hang.result
3518share/mysql/test/suite/innodb/r/foreign_key.result 3519share/mysql/test/suite/innodb/r/foreign_key.result
 3520share/mysql/test/suite/innodb/r/ibuf_not_empty.result
3519share/mysql/test/suite/innodb/r/import.result 3521share/mysql/test/suite/innodb/r/import.result
3520share/mysql/test/suite/innodb/r/import_update_stats.result 3522share/mysql/test/suite/innodb/r/import_update_stats.result
3521share/mysql/test/suite/innodb/r/index_tree_operation.result 3523share/mysql/test/suite/innodb/r/index_tree_operation.result
3522share/mysql/test/suite/innodb/r/innodb-2byte-collation.result 3524share/mysql/test/suite/innodb/r/innodb-2byte-collation.result
3523share/mysql/test/suite/innodb/r/innodb-ac-non-locking-select.result 3525share/mysql/test/suite/innodb/r/innodb-ac-non-locking-select.result
3524share/mysql/test/suite/innodb/r/innodb-alter-autoinc.result 3526share/mysql/test/suite/innodb/r/innodb-alter-autoinc.result
3525share/mysql/test/suite/innodb/r/innodb-alter-debug.result 3527share/mysql/test/suite/innodb/r/innodb-alter-debug.result
3526share/mysql/test/suite/innodb/r/innodb-alter-discard.result 3528share/mysql/test/suite/innodb/r/innodb-alter-discard.result
3527share/mysql/test/suite/innodb/r/innodb-alter-nullable.result 3529share/mysql/test/suite/innodb/r/innodb-alter-nullable.result
3528share/mysql/test/suite/innodb/r/innodb-alter-tempfile.result 3530share/mysql/test/suite/innodb/r/innodb-alter-tempfile.result
3529share/mysql/test/suite/innodb/r/innodb-alter.result 3531share/mysql/test/suite/innodb/r/innodb-alter.result
3530share/mysql/test/suite/innodb/r/innodb-analyze.result 3532share/mysql/test/suite/innodb/r/innodb-analyze.result
3531share/mysql/test/suite/innodb/r/innodb-autoinc-18274.result 3533share/mysql/test/suite/innodb/r/innodb-autoinc-18274.result
@@ -3649,26 +3651,27 @@ share/mysql/test/suite/innodb/r/innodb_b @@ -3649,26 +3651,27 @@ share/mysql/test/suite/innodb/r/innodb_b
3649share/mysql/test/suite/innodb/r/innodb_bug60196.result 3651share/mysql/test/suite/innodb/r/innodb_bug60196.result
3650share/mysql/test/suite/innodb/r/innodb_bug60229.result 3652share/mysql/test/suite/innodb/r/innodb_bug60229.result
3651share/mysql/test/suite/innodb/r/innodb_bug70867.result 3653share/mysql/test/suite/innodb/r/innodb_bug70867.result
3652share/mysql/test/suite/innodb/r/innodb_corrupt_bit.result 3654share/mysql/test/suite/innodb/r/innodb_corrupt_bit.result
3653share/mysql/test/suite/innodb/r/innodb_ctype_ldml.result 3655share/mysql/test/suite/innodb/r/innodb_ctype_ldml.result
3654share/mysql/test/suite/innodb/r/innodb_deadlock_with_autoinc.result 3656share/mysql/test/suite/innodb/r/innodb_deadlock_with_autoinc.result
3655share/mysql/test/suite/innodb/r/innodb_file_format.result 3657share/mysql/test/suite/innodb/r/innodb_file_format.result
3656share/mysql/test/suite/innodb/r/innodb_file_limit_check.result 3658share/mysql/test/suite/innodb/r/innodb_file_limit_check.result
3657share/mysql/test/suite/innodb/r/innodb_force_recovery.result 3659share/mysql/test/suite/innodb/r/innodb_force_recovery.result
3658share/mysql/test/suite/innodb/r/innodb_gis.result 3660share/mysql/test/suite/innodb/r/innodb_gis.result
3659share/mysql/test/suite/innodb/r/innodb_i_s_innodb_locks.result 3661share/mysql/test/suite/innodb/r/innodb_i_s_innodb_locks.result
3660share/mysql/test/suite/innodb/r/innodb_i_s_innodb_trx.result 3662share/mysql/test/suite/innodb/r/innodb_i_s_innodb_trx.result
3661share/mysql/test/suite/innodb/r/innodb_information_schema_buffer.result 3663share/mysql/test/suite/innodb/r/innodb_information_schema_buffer.result
 3664share/mysql/test/suite/innodb/r/innodb_io_pf.result
3662share/mysql/test/suite/innodb/r/innodb_lock_wait_timeout_1.result 3665share/mysql/test/suite/innodb/r/innodb_lock_wait_timeout_1.result
3663share/mysql/test/suite/innodb/r/innodb_misc1.result 3666share/mysql/test/suite/innodb/r/innodb_misc1.result
3664share/mysql/test/suite/innodb/r/innodb_multi_update.result 3667share/mysql/test/suite/innodb/r/innodb_multi_update.result
3665share/mysql/test/suite/innodb/r/innodb_mysql.result 3668share/mysql/test/suite/innodb/r/innodb_mysql.result
3666share/mysql/test/suite/innodb/r/innodb_mysql_rbk.result 3669share/mysql/test/suite/innodb/r/innodb_mysql_rbk.result
3667share/mysql/test/suite/innodb/r/innodb_notembedded.result 3670share/mysql/test/suite/innodb/r/innodb_notembedded.result
3668share/mysql/test/suite/innodb/r/innodb_page_size_func.result 3671share/mysql/test/suite/innodb/r/innodb_page_size_func.result
3669share/mysql/test/suite/innodb/r/innodb_prefix_index_restart_server.result 3672share/mysql/test/suite/innodb/r/innodb_prefix_index_restart_server.result
3670share/mysql/test/suite/innodb/r/innodb_replace.result 3673share/mysql/test/suite/innodb/r/innodb_replace.result
3671share/mysql/test/suite/innodb/r/innodb_stats.result 3674share/mysql/test/suite/innodb/r/innodb_stats.result
3672share/mysql/test/suite/innodb/r/innodb_stats_auto_recalc.result 3675share/mysql/test/suite/innodb/r/innodb_stats_auto_recalc.result
3673share/mysql/test/suite/innodb/r/innodb_stats_auto_recalc_ddl.result 3676share/mysql/test/suite/innodb/r/innodb_stats_auto_recalc_ddl.result
3674share/mysql/test/suite/innodb/r/innodb_stats_auto_recalc_lots.result 3677share/mysql/test/suite/innodb/r/innodb_stats_auto_recalc_lots.result
@@ -3689,42 +3692,46 @@ share/mysql/test/suite/innodb/r/innodb_s @@ -3689,42 +3692,46 @@ share/mysql/test/suite/innodb/r/innodb_s
3689share/mysql/test/suite/innodb/r/innodb_stats_table_flag_auto_recalc.result 3692share/mysql/test/suite/innodb/r/innodb_stats_table_flag_auto_recalc.result
3690share/mysql/test/suite/innodb/r/innodb_stats_table_flag_sample_pages.result 3693share/mysql/test/suite/innodb/r/innodb_stats_table_flag_sample_pages.result
3691share/mysql/test/suite/innodb/r/innodb_timeout_rollback.result 3694share/mysql/test/suite/innodb/r/innodb_timeout_rollback.result
3692share/mysql/test/suite/innodb/r/innodb_trx_weight.result 3695share/mysql/test/suite/innodb/r/innodb_trx_weight.result
3693share/mysql/test/suite/innodb/r/innodb_upd_stats_if_needed_not_inited.result 3696share/mysql/test/suite/innodb/r/innodb_upd_stats_if_needed_not_inited.result
3694share/mysql/test/suite/innodb/r/innodb_ut_format_name.result 3697share/mysql/test/suite/innodb/r/innodb_ut_format_name.result
3695share/mysql/test/suite/innodb/r/insert_debug.result 3698share/mysql/test/suite/innodb/r/insert_debug.result
3696share/mysql/test/suite/innodb/r/monitor.result 3699share/mysql/test/suite/innodb/r/monitor.result
3697share/mysql/test/suite/innodb/r/monitor_debug.result 3700share/mysql/test/suite/innodb/r/monitor_debug.result
3698share/mysql/test/suite/innodb/r/sp_temp_table.result 3701share/mysql/test/suite/innodb/r/sp_temp_table.result
3699share/mysql/test/suite/innodb/r/strict_checksum.result 3702share/mysql/test/suite/innodb/r/strict_checksum.result
3700share/mysql/test/suite/innodb/r/strict_mode.result 3703share/mysql/test/suite/innodb/r/strict_mode.result
3701share/mysql/test/suite/innodb/r/tmpdir.result 3704share/mysql/test/suite/innodb/r/tmpdir.result
 3705share/mysql/test/suite/innodb/r/undo_space_id.result
3702share/mysql/test/suite/innodb/r/xa_recovery.result 3706share/mysql/test/suite/innodb/r/xa_recovery.result
3703share/mysql/test/suite/innodb/t/add_foreign_key.test 3707share/mysql/test/suite/innodb/t/add_foreign_key.test
3704share/mysql/test/suite/innodb/t/alter_rename_existing.test 3708share/mysql/test/suite/innodb/t/alter_rename_existing.test
3705share/mysql/test/suite/innodb/t/analyze_table.test 3709share/mysql/test/suite/innodb/t/analyze_table.test
3706share/mysql/test/suite/innodb/t/autoinc_debug.test 3710share/mysql/test/suite/innodb/t/autoinc_debug.test
3707share/mysql/test/suite/innodb/t/blob-update-debug.test 3711share/mysql/test/suite/innodb/t/blob-update-debug.test
3708share/mysql/test/suite/innodb/t/blob_redo-master.opt 3712share/mysql/test/suite/innodb/t/blob_redo-master.opt
3709share/mysql/test/suite/innodb/t/blob_redo.test 3713share/mysql/test/suite/innodb/t/blob_redo.test
3710share/mysql/test/suite/innodb/t/checksum.test 3714share/mysql/test/suite/innodb/t/checksum.test
3711share/mysql/test/suite/innodb/t/create-index.test 3715share/mysql/test/suite/innodb/t/create-index.test
3712share/mysql/test/suite/innodb/t/create_isl_with_direct-master.opt 3716share/mysql/test/suite/innodb/t/create_isl_with_direct-master.opt
3713share/mysql/test/suite/innodb/t/create_isl_with_direct.test 3717share/mysql/test/suite/innodb/t/create_isl_with_direct.test
3714share/mysql/test/suite/innodb/t/disabled.def 3718share/mysql/test/suite/innodb/t/disabled.def
3715share/mysql/test/suite/innodb/t/dropdb.test 3719share/mysql/test/suite/innodb/t/dropdb.test
 3720share/mysql/test/suite/innodb/t/end_range_check.test
3716share/mysql/test/suite/innodb/t/flush-hang.test 3721share/mysql/test/suite/innodb/t/flush-hang.test
3717share/mysql/test/suite/innodb/t/foreign_key.test 3722share/mysql/test/suite/innodb/t/foreign_key.test
 3723share/mysql/test/suite/innodb/t/ibuf_not_empty-master.opt
 3724share/mysql/test/suite/innodb/t/ibuf_not_empty.test
3718share/mysql/test/suite/innodb/t/import.test 3725share/mysql/test/suite/innodb/t/import.test
3719share/mysql/test/suite/innodb/t/import_update_stats.test 3726share/mysql/test/suite/innodb/t/import_update_stats.test
3720share/mysql/test/suite/innodb/t/index_tree_operation.test 3727share/mysql/test/suite/innodb/t/index_tree_operation.test
3721share/mysql/test/suite/innodb/t/innodb-2byte-collation-master.opt 3728share/mysql/test/suite/innodb/t/innodb-2byte-collation-master.opt
3722share/mysql/test/suite/innodb/t/innodb-2byte-collation.test 3729share/mysql/test/suite/innodb/t/innodb-2byte-collation.test
3723share/mysql/test/suite/innodb/t/innodb-ac-non-locking-select.test 3730share/mysql/test/suite/innodb/t/innodb-ac-non-locking-select.test
3724share/mysql/test/suite/innodb/t/innodb-alter-autoinc.test 3731share/mysql/test/suite/innodb/t/innodb-alter-autoinc.test
3725share/mysql/test/suite/innodb/t/innodb-alter-debug.test 3732share/mysql/test/suite/innodb/t/innodb-alter-debug.test
3726share/mysql/test/suite/innodb/t/innodb-alter-discard.test 3733share/mysql/test/suite/innodb/t/innodb-alter-discard.test
3727share/mysql/test/suite/innodb/t/innodb-alter-nullable.test 3734share/mysql/test/suite/innodb/t/innodb-alter-nullable.test
3728share/mysql/test/suite/innodb/t/innodb-alter-tempfile.test 3735share/mysql/test/suite/innodb/t/innodb-alter-tempfile.test
3729share/mysql/test/suite/innodb/t/innodb-alter.test 3736share/mysql/test/suite/innodb/t/innodb-alter.test
3730share/mysql/test/suite/innodb/t/innodb-analyze.test 3737share/mysql/test/suite/innodb/t/innodb-analyze.test
@@ -3877,26 +3884,27 @@ share/mysql/test/suite/innodb/t/innodb_c @@ -3877,26 +3884,27 @@ share/mysql/test/suite/innodb/t/innodb_c
3877share/mysql/test/suite/innodb/t/innodb_ctype_ldml-master.opt 3884share/mysql/test/suite/innodb/t/innodb_ctype_ldml-master.opt
3878share/mysql/test/suite/innodb/t/innodb_ctype_ldml.test 3885share/mysql/test/suite/innodb/t/innodb_ctype_ldml.test
3879share/mysql/test/suite/innodb/t/innodb_deadlock_with_autoinc-master.opt 3886share/mysql/test/suite/innodb/t/innodb_deadlock_with_autoinc-master.opt
3880share/mysql/test/suite/innodb/t/innodb_deadlock_with_autoinc.test 3887share/mysql/test/suite/innodb/t/innodb_deadlock_with_autoinc.test
3881share/mysql/test/suite/innodb/t/innodb_file_format-master.opt 3888share/mysql/test/suite/innodb/t/innodb_file_format-master.opt
3882share/mysql/test/suite/innodb/t/innodb_file_format.test 3889share/mysql/test/suite/innodb/t/innodb_file_format.test
3883share/mysql/test/suite/innodb/t/innodb_file_limit_check-master.opt 3890share/mysql/test/suite/innodb/t/innodb_file_limit_check-master.opt
3884share/mysql/test/suite/innodb/t/innodb_file_limit_check.test 3891share/mysql/test/suite/innodb/t/innodb_file_limit_check.test
3885share/mysql/test/suite/innodb/t/innodb_force_recovery.test 3892share/mysql/test/suite/innodb/t/innodb_force_recovery.test
3886share/mysql/test/suite/innodb/t/innodb_gis.test 3893share/mysql/test/suite/innodb/t/innodb_gis.test
3887share/mysql/test/suite/innodb/t/innodb_i_s_innodb_locks.test 3894share/mysql/test/suite/innodb/t/innodb_i_s_innodb_locks.test
3888share/mysql/test/suite/innodb/t/innodb_i_s_innodb_trx.test 3895share/mysql/test/suite/innodb/t/innodb_i_s_innodb_trx.test
3889share/mysql/test/suite/innodb/t/innodb_information_schema_buffer.test 3896share/mysql/test/suite/innodb/t/innodb_information_schema_buffer.test
 3897share/mysql/test/suite/innodb/t/innodb_io_pf.test
3890share/mysql/test/suite/innodb/t/innodb_lock_wait_timeout_1-master.opt 3898share/mysql/test/suite/innodb/t/innodb_lock_wait_timeout_1-master.opt
3891share/mysql/test/suite/innodb/t/innodb_lock_wait_timeout_1.test 3899share/mysql/test/suite/innodb/t/innodb_lock_wait_timeout_1.test
3892share/mysql/test/suite/innodb/t/innodb_misc1-master.opt 3900share/mysql/test/suite/innodb/t/innodb_misc1-master.opt
3893share/mysql/test/suite/innodb/t/innodb_misc1.test 3901share/mysql/test/suite/innodb/t/innodb_misc1.test
3894share/mysql/test/suite/innodb/t/innodb_multi_update.test 3902share/mysql/test/suite/innodb/t/innodb_multi_update.test
3895share/mysql/test/suite/innodb/t/innodb_mysql-master.opt 3903share/mysql/test/suite/innodb/t/innodb_mysql-master.opt
3896share/mysql/test/suite/innodb/t/innodb_mysql.test 3904share/mysql/test/suite/innodb/t/innodb_mysql.test
3897share/mysql/test/suite/innodb/t/innodb_mysql_rbk-master.opt 3905share/mysql/test/suite/innodb/t/innodb_mysql_rbk-master.opt
3898share/mysql/test/suite/innodb/t/innodb_mysql_rbk.test 3906share/mysql/test/suite/innodb/t/innodb_mysql_rbk.test
3899share/mysql/test/suite/innodb/t/innodb_notembedded.test 3907share/mysql/test/suite/innodb/t/innodb_notembedded.test
3900share/mysql/test/suite/innodb/t/innodb_page_size_func.test 3908share/mysql/test/suite/innodb/t/innodb_page_size_func.test
3901share/mysql/test/suite/innodb/t/innodb_prefix_index_restart_server.test 3909share/mysql/test/suite/innodb/t/innodb_prefix_index_restart_server.test
3902share/mysql/test/suite/innodb/t/innodb_replace.test 3910share/mysql/test/suite/innodb/t/innodb_replace.test
@@ -3927,26 +3935,27 @@ share/mysql/test/suite/innodb/t/innodb_t @@ -3927,26 +3935,27 @@ share/mysql/test/suite/innodb/t/innodb_t
3927share/mysql/test/suite/innodb/t/innodb_timeout_rollback.test 3935share/mysql/test/suite/innodb/t/innodb_timeout_rollback.test
3928share/mysql/test/suite/innodb/t/innodb_trx_weight.test 3936share/mysql/test/suite/innodb/t/innodb_trx_weight.test
3929share/mysql/test/suite/innodb/t/innodb_upd_stats_if_needed_not_inited.test 3937share/mysql/test/suite/innodb/t/innodb_upd_stats_if_needed_not_inited.test
3930share/mysql/test/suite/innodb/t/innodb_ut_format_name.test 3938share/mysql/test/suite/innodb/t/innodb_ut_format_name.test
3931share/mysql/test/suite/innodb/t/insert_debug.test 3939share/mysql/test/suite/innodb/t/insert_debug.test
3932share/mysql/test/suite/innodb/t/monitor.test 3940share/mysql/test/suite/innodb/t/monitor.test
3933share/mysql/test/suite/innodb/t/monitor_debug.test 3941share/mysql/test/suite/innodb/t/monitor_debug.test
3934share/mysql/test/suite/innodb/t/portability_wl5980_linux.zip 3942share/mysql/test/suite/innodb/t/portability_wl5980_linux.zip
3935share/mysql/test/suite/innodb/t/portability_wl5980_windows.zip 3943share/mysql/test/suite/innodb/t/portability_wl5980_windows.zip
3936share/mysql/test/suite/innodb/t/sp_temp_table.test 3944share/mysql/test/suite/innodb/t/sp_temp_table.test
3937share/mysql/test/suite/innodb/t/strict_checksum.test 3945share/mysql/test/suite/innodb/t/strict_checksum.test
3938share/mysql/test/suite/innodb/t/strict_mode.test 3946share/mysql/test/suite/innodb/t/strict_mode.test
3939share/mysql/test/suite/innodb/t/tmpdir.test 3947share/mysql/test/suite/innodb/t/tmpdir.test
 3948share/mysql/test/suite/innodb/t/undo_space_id.test
3940share/mysql/test/suite/innodb/t/xa_recovery.test 3949share/mysql/test/suite/innodb/t/xa_recovery.test
3941share/mysql/test/suite/innodb_fts/r/fts_compatibility.result 3950share/mysql/test/suite/innodb_fts/r/fts_compatibility.result
3942share/mysql/test/suite/innodb_fts/r/fts_compatibility_win.result 3951share/mysql/test/suite/innodb_fts/r/fts_compatibility_win.result
3943share/mysql/test/suite/innodb_fts/r/fulltext.result 3952share/mysql/test/suite/innodb_fts/r/fulltext.result
3944share/mysql/test/suite/innodb_fts/r/fulltext2.result 3953share/mysql/test/suite/innodb_fts/r/fulltext2.result
3945share/mysql/test/suite/innodb_fts/r/fulltext3.result 3954share/mysql/test/suite/innodb_fts/r/fulltext3.result
3946share/mysql/test/suite/innodb_fts/r/fulltext_cache.result 3955share/mysql/test/suite/innodb_fts/r/fulltext_cache.result
3947share/mysql/test/suite/innodb_fts/r/fulltext_distinct.result 3956share/mysql/test/suite/innodb_fts/r/fulltext_distinct.result
3948share/mysql/test/suite/innodb_fts/r/fulltext_left_join.result 3957share/mysql/test/suite/innodb_fts/r/fulltext_left_join.result
3949share/mysql/test/suite/innodb_fts/r/fulltext_misc.result 3958share/mysql/test/suite/innodb_fts/r/fulltext_misc.result
3950share/mysql/test/suite/innodb_fts/r/fulltext_multi.result 3959share/mysql/test/suite/innodb_fts/r/fulltext_multi.result
3951share/mysql/test/suite/innodb_fts/r/fulltext_order_by.result 3960share/mysql/test/suite/innodb_fts/r/fulltext_order_by.result
3952share/mysql/test/suite/innodb_fts/r/fulltext_update.result 3961share/mysql/test/suite/innodb_fts/r/fulltext_update.result
@@ -5749,26 +5758,27 @@ share/mysql/test/suite/perfschema/r/sizi @@ -5749,26 +5758,27 @@ share/mysql/test/suite/perfschema/r/sizi
5749share/mysql/test/suite/perfschema/r/sizing_low.result 5758share/mysql/test/suite/perfschema/r/sizing_low.result
5750share/mysql/test/suite/perfschema/r/sizing_med.result 5759share/mysql/test/suite/perfschema/r/sizing_med.result
5751share/mysql/test/suite/perfschema/r/sizing_off.result 5760share/mysql/test/suite/perfschema/r/sizing_off.result
5752share/mysql/test/suite/perfschema/r/socket_connect.result 5761share/mysql/test/suite/perfschema/r/socket_connect.result
5753share/mysql/test/suite/perfschema/r/socket_instances_func.result 5762share/mysql/test/suite/perfschema/r/socket_instances_func.result
5754share/mysql/test/suite/perfschema/r/socket_instances_func_win.result 5763share/mysql/test/suite/perfschema/r/socket_instances_func_win.result
5755share/mysql/test/suite/perfschema/r/socket_summary_by_event_name_func.result 5764share/mysql/test/suite/perfschema/r/socket_summary_by_event_name_func.result
5756share/mysql/test/suite/perfschema/r/socket_summary_by_instance_func.result 5765share/mysql/test/suite/perfschema/r/socket_summary_by_instance_func.result
5757share/mysql/test/suite/perfschema/r/socket_summary_by_instance_func_win.result 5766share/mysql/test/suite/perfschema/r/socket_summary_by_instance_func_win.result
5758share/mysql/test/suite/perfschema/r/stage_mdl_function.result 5767share/mysql/test/suite/perfschema/r/stage_mdl_function.result
5759share/mysql/test/suite/perfschema/r/stage_mdl_global.result 5768share/mysql/test/suite/perfschema/r/stage_mdl_global.result
5760share/mysql/test/suite/perfschema/r/stage_mdl_procedure.result 5769share/mysql/test/suite/perfschema/r/stage_mdl_procedure.result
5761share/mysql/test/suite/perfschema/r/stage_mdl_table.result 5770share/mysql/test/suite/perfschema/r/stage_mdl_table.result
 5771share/mysql/test/suite/perfschema/r/start_server_1_digest.result
5762share/mysql/test/suite/perfschema/r/start_server_disable_idle.result 5772share/mysql/test/suite/perfschema/r/start_server_disable_idle.result
5763share/mysql/test/suite/perfschema/r/start_server_disable_stages.result 5773share/mysql/test/suite/perfschema/r/start_server_disable_stages.result
5764share/mysql/test/suite/perfschema/r/start_server_disable_statements.result 5774share/mysql/test/suite/perfschema/r/start_server_disable_statements.result
5765share/mysql/test/suite/perfschema/r/start_server_disable_waits.result 5775share/mysql/test/suite/perfschema/r/start_server_disable_waits.result
5766share/mysql/test/suite/perfschema/r/start_server_innodb.result 5776share/mysql/test/suite/perfschema/r/start_server_innodb.result
5767share/mysql/test/suite/perfschema/r/start_server_low_digest.result 5777share/mysql/test/suite/perfschema/r/start_server_low_digest.result
5768share/mysql/test/suite/perfschema/r/start_server_no_account.result 5778share/mysql/test/suite/perfschema/r/start_server_no_account.result
5769share/mysql/test/suite/perfschema/r/start_server_no_cond_class.result 5779share/mysql/test/suite/perfschema/r/start_server_no_cond_class.result
5770share/mysql/test/suite/perfschema/r/start_server_no_cond_inst.result 5780share/mysql/test/suite/perfschema/r/start_server_no_cond_inst.result
5771share/mysql/test/suite/perfschema/r/start_server_no_digests.result 5781share/mysql/test/suite/perfschema/r/start_server_no_digests.result
5772share/mysql/test/suite/perfschema/r/start_server_no_file_class.result 5782share/mysql/test/suite/perfschema/r/start_server_no_file_class.result
5773share/mysql/test/suite/perfschema/r/start_server_no_file_inst.result 5783share/mysql/test/suite/perfschema/r/start_server_no_file_inst.result
5774share/mysql/test/suite/perfschema/r/start_server_no_host.result 5784share/mysql/test/suite/perfschema/r/start_server_no_host.result
@@ -6126,26 +6136,28 @@ share/mysql/test/suite/perfschema/t/sizi @@ -6126,26 +6136,28 @@ share/mysql/test/suite/perfschema/t/sizi
6126share/mysql/test/suite/perfschema/t/socket_connect.test 6136share/mysql/test/suite/perfschema/t/socket_connect.test
6127share/mysql/test/suite/perfschema/t/socket_instances_func-master.opt 6137share/mysql/test/suite/perfschema/t/socket_instances_func-master.opt
6128share/mysql/test/suite/perfschema/t/socket_instances_func.test 6138share/mysql/test/suite/perfschema/t/socket_instances_func.test
6129share/mysql/test/suite/perfschema/t/socket_instances_func_win-master.opt 6139share/mysql/test/suite/perfschema/t/socket_instances_func_win-master.opt
6130share/mysql/test/suite/perfschema/t/socket_instances_func_win.test 6140share/mysql/test/suite/perfschema/t/socket_instances_func_win.test
6131share/mysql/test/suite/perfschema/t/socket_summary_by_event_name_func.test 6141share/mysql/test/suite/perfschema/t/socket_summary_by_event_name_func.test
6132share/mysql/test/suite/perfschema/t/socket_summary_by_instance_func.test 6142share/mysql/test/suite/perfschema/t/socket_summary_by_instance_func.test
6133share/mysql/test/suite/perfschema/t/socket_summary_by_instance_func_win.test 6143share/mysql/test/suite/perfschema/t/socket_summary_by_instance_func_win.test
6134share/mysql/test/suite/perfschema/t/stage_mdl_function.test 6144share/mysql/test/suite/perfschema/t/stage_mdl_function.test
6135share/mysql/test/suite/perfschema/t/stage_mdl_global-master.opt 6145share/mysql/test/suite/perfschema/t/stage_mdl_global-master.opt
6136share/mysql/test/suite/perfschema/t/stage_mdl_global.test 6146share/mysql/test/suite/perfschema/t/stage_mdl_global.test
6137share/mysql/test/suite/perfschema/t/stage_mdl_procedure.test 6147share/mysql/test/suite/perfschema/t/stage_mdl_procedure.test
6138share/mysql/test/suite/perfschema/t/stage_mdl_table.test 6148share/mysql/test/suite/perfschema/t/stage_mdl_table.test
 6149share/mysql/test/suite/perfschema/t/start_server_1_digest-master.opt
 6150share/mysql/test/suite/perfschema/t/start_server_1_digest.test
6139share/mysql/test/suite/perfschema/t/start_server_disable_idle-master.opt 6151share/mysql/test/suite/perfschema/t/start_server_disable_idle-master.opt
6140share/mysql/test/suite/perfschema/t/start_server_disable_idle.test 6152share/mysql/test/suite/perfschema/t/start_server_disable_idle.test
6141share/mysql/test/suite/perfschema/t/start_server_disable_stages-master.opt 6153share/mysql/test/suite/perfschema/t/start_server_disable_stages-master.opt
6142share/mysql/test/suite/perfschema/t/start_server_disable_stages.test 6154share/mysql/test/suite/perfschema/t/start_server_disable_stages.test
6143share/mysql/test/suite/perfschema/t/start_server_disable_statements-master.opt 6155share/mysql/test/suite/perfschema/t/start_server_disable_statements-master.opt
6144share/mysql/test/suite/perfschema/t/start_server_disable_statements.test 6156share/mysql/test/suite/perfschema/t/start_server_disable_statements.test
6145share/mysql/test/suite/perfschema/t/start_server_disable_waits-master.opt 6157share/mysql/test/suite/perfschema/t/start_server_disable_waits-master.opt
6146share/mysql/test/suite/perfschema/t/start_server_disable_waits.test 6158share/mysql/test/suite/perfschema/t/start_server_disable_waits.test
6147share/mysql/test/suite/perfschema/t/start_server_innodb-master.opt 6159share/mysql/test/suite/perfschema/t/start_server_innodb-master.opt
6148share/mysql/test/suite/perfschema/t/start_server_innodb.test 6160share/mysql/test/suite/perfschema/t/start_server_innodb.test
6149share/mysql/test/suite/perfschema/t/start_server_low_digest-master.opt 6161share/mysql/test/suite/perfschema/t/start_server_low_digest-master.opt
6150share/mysql/test/suite/perfschema/t/start_server_low_digest.test 6162share/mysql/test/suite/perfschema/t/start_server_low_digest.test
6151share/mysql/test/suite/perfschema/t/start_server_no_account-master.opt 6163share/mysql/test/suite/perfschema/t/start_server_no_account-master.opt
@@ -6309,26 +6321,27 @@ share/mysql/test/suite/rpl/my.cnf @@ -6309,26 +6321,27 @@ share/mysql/test/suite/rpl/my.cnf
6309share/mysql/test/suite/rpl/r/rpl000001.a.result 6321share/mysql/test/suite/rpl/r/rpl000001.a.result
6310share/mysql/test/suite/rpl/r/rpl000001.b.result 6322share/mysql/test/suite/rpl/r/rpl000001.b.result
6311share/mysql/test/suite/rpl/r/rpl_000010.result 6323share/mysql/test/suite/rpl/r/rpl_000010.result
6312share/mysql/test/suite/rpl/r/rpl_000011.result 6324share/mysql/test/suite/rpl/r/rpl_000011.result
6313share/mysql/test/suite/rpl/r/rpl_000013.result 6325share/mysql/test/suite/rpl/r/rpl_000013.result
6314share/mysql/test/suite/rpl/r/rpl_000017.result 6326share/mysql/test/suite/rpl/r/rpl_000017.result
6315share/mysql/test/suite/rpl/r/rpl_4threads_deadlock.result 6327share/mysql/test/suite/rpl/r/rpl_4threads_deadlock.result
6316share/mysql/test/suite/rpl/r/rpl_DML_error.result 6328share/mysql/test/suite/rpl/r/rpl_DML_error.result
6317share/mysql/test/suite/rpl/r/rpl_EE_err.result 6329share/mysql/test/suite/rpl/r/rpl_EE_err.result
6318share/mysql/test/suite/rpl/r/rpl_LD_INFILE.result 6330share/mysql/test/suite/rpl/r/rpl_LD_INFILE.result
6319share/mysql/test/suite/rpl/r/rpl_alter.result 6331share/mysql/test/suite/rpl/r/rpl_alter.result
6320share/mysql/test/suite/rpl/r/rpl_alter_db.result 6332share/mysql/test/suite/rpl/r/rpl_alter_db.result
6321share/mysql/test/suite/rpl/r/rpl_alter_repository.result 6333share/mysql/test/suite/rpl/r/rpl_alter_repository.result
 6334share/mysql/test/suite/rpl/r/rpl_alter_user.result
6322share/mysql/test/suite/rpl/r/rpl_apply_binlog_with_anonymous_gtid.result 6335share/mysql/test/suite/rpl/r/rpl_apply_binlog_with_anonymous_gtid.result
6323share/mysql/test/suite/rpl/r/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.result 6336share/mysql/test/suite/rpl/r/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.result
6324share/mysql/test/suite/rpl/r/rpl_apply_binlog_with_gtid_when_gtid_mode_off.result 6337share/mysql/test/suite/rpl/r/rpl_apply_binlog_with_gtid_when_gtid_mode_off.result
6325share/mysql/test/suite/rpl/r/rpl_auto_increment.result 6338share/mysql/test/suite/rpl/r/rpl_auto_increment.result
6326share/mysql/test/suite/rpl/r/rpl_auto_increment_11932.result 6339share/mysql/test/suite/rpl/r/rpl_auto_increment_11932.result
6327share/mysql/test/suite/rpl/r/rpl_auto_increment_bug33029.result 6340share/mysql/test/suite/rpl/r/rpl_auto_increment_bug33029.result
6328share/mysql/test/suite/rpl/r/rpl_auto_increment_bug45679.result 6341share/mysql/test/suite/rpl/r/rpl_auto_increment_bug45679.result
6329share/mysql/test/suite/rpl/r/rpl_auto_increment_update_failure.result 6342share/mysql/test/suite/rpl/r/rpl_auto_increment_update_failure.result
6330share/mysql/test/suite/rpl/r/rpl_autogen_query_multi_byte_char.result 6343share/mysql/test/suite/rpl/r/rpl_autogen_query_multi_byte_char.result
6331share/mysql/test/suite/rpl/r/rpl_autoinc_lock_style.result 6344share/mysql/test/suite/rpl/r/rpl_autoinc_lock_style.result
6332share/mysql/test/suite/rpl/r/rpl_avoid_temporal_upgrade.result 6345share/mysql/test/suite/rpl/r/rpl_avoid_temporal_upgrade.result
6333share/mysql/test/suite/rpl/r/rpl_begin_commit_rollback.result 6346share/mysql/test/suite/rpl/r/rpl_begin_commit_rollback.result
6334share/mysql/test/suite/rpl/r/rpl_binlog_corruption.result 6347share/mysql/test/suite/rpl/r/rpl_binlog_corruption.result
@@ -6659,26 +6672,27 @@ share/mysql/test/suite/rpl/r/rpl_row_tab @@ -6659,26 +6672,27 @@ share/mysql/test/suite/rpl/r/rpl_row_tab
6659share/mysql/test/suite/rpl/r/rpl_row_tbl_metadata.result 6672share/mysql/test/suite/rpl/r/rpl_row_tbl_metadata.result
6660share/mysql/test/suite/rpl/r/rpl_row_trig001.result 6673share/mysql/test/suite/rpl/r/rpl_row_trig001.result
6661share/mysql/test/suite/rpl/r/rpl_row_trig002.result 6674share/mysql/test/suite/rpl/r/rpl_row_trig002.result
6662share/mysql/test/suite/rpl/r/rpl_row_trig003.result 6675share/mysql/test/suite/rpl/r/rpl_row_trig003.result
6663share/mysql/test/suite/rpl/r/rpl_row_trig004.result 6676share/mysql/test/suite/rpl/r/rpl_row_trig004.result
6664share/mysql/test/suite/rpl/r/rpl_row_trunc_temp.result 6677share/mysql/test/suite/rpl/r/rpl_row_trunc_temp.result
6665share/mysql/test/suite/rpl/r/rpl_row_unsafe_funcs.result 6678share/mysql/test/suite/rpl/r/rpl_row_unsafe_funcs.result
6666share/mysql/test/suite/rpl/r/rpl_row_until.result 6679share/mysql/test/suite/rpl/r/rpl_row_until.result
6667share/mysql/test/suite/rpl/r/rpl_row_utf16.result 6680share/mysql/test/suite/rpl/r/rpl_row_utf16.result
6668share/mysql/test/suite/rpl/r/rpl_row_utf32.result 6681share/mysql/test/suite/rpl/r/rpl_row_utf32.result
6669share/mysql/test/suite/rpl/r/rpl_row_view01.result 6682share/mysql/test/suite/rpl/r/rpl_row_view01.result
6670share/mysql/test/suite/rpl/r/rpl_row_wide_table.result 6683share/mysql/test/suite/rpl/r/rpl_row_wide_table.result
6671share/mysql/test/suite/rpl/r/rpl_savepoint.result 6684share/mysql/test/suite/rpl/r/rpl_savepoint.result
 6685share/mysql/test/suite/rpl/r/rpl_sbm_fake_rotate_event.result
6672share/mysql/test/suite/rpl/r/rpl_sbm_previous_gtid_event.result 6686share/mysql/test/suite/rpl/r/rpl_sbm_previous_gtid_event.result
6673share/mysql/test/suite/rpl/r/rpl_seconds_behind_master.result 6687share/mysql/test/suite/rpl/r/rpl_seconds_behind_master.result
6674share/mysql/test/suite/rpl/r/rpl_semi_sync.result 6688share/mysql/test/suite/rpl/r/rpl_semi_sync.result
6675share/mysql/test/suite/rpl/r/rpl_semi_sync_deadlock.result 6689share/mysql/test/suite/rpl/r/rpl_semi_sync_deadlock.result
6676share/mysql/test/suite/rpl/r/rpl_semi_sync_event.result 6690share/mysql/test/suite/rpl/r/rpl_semi_sync_event.result
6677share/mysql/test/suite/rpl/r/rpl_semi_sync_future_logpos.result 6691share/mysql/test/suite/rpl/r/rpl_semi_sync_future_logpos.result
6678share/mysql/test/suite/rpl/r/rpl_semi_sync_group_commit_deadlock.result 6692share/mysql/test/suite/rpl/r/rpl_semi_sync_group_commit_deadlock.result
6679share/mysql/test/suite/rpl/r/rpl_semi_sync_non_group_commit_deadlock.result 6693share/mysql/test/suite/rpl/r/rpl_semi_sync_non_group_commit_deadlock.result
6680share/mysql/test/suite/rpl/r/rpl_semi_sync_shutdown_hang.result 6694share/mysql/test/suite/rpl/r/rpl_semi_sync_shutdown_hang.result
6681share/mysql/test/suite/rpl/r/rpl_semi_sync_uninstall_plugin.result 6695share/mysql/test/suite/rpl/r/rpl_semi_sync_uninstall_plugin.result
6682share/mysql/test/suite/rpl/r/rpl_sequential.result 6696share/mysql/test/suite/rpl/r/rpl_sequential.result
6683share/mysql/test/suite/rpl/r/rpl_server_id1.result 6697share/mysql/test/suite/rpl/r/rpl_server_id1.result
6684share/mysql/test/suite/rpl/r/rpl_server_id2.result 6698share/mysql/test/suite/rpl/r/rpl_server_id2.result
@@ -6786,26 +6800,27 @@ share/mysql/test/suite/rpl/rpl_1slave_ba @@ -6786,26 +6800,27 @@ share/mysql/test/suite/rpl/rpl_1slave_ba
6786share/mysql/test/suite/rpl/t/disabled.def 6800share/mysql/test/suite/rpl/t/disabled.def
6787share/mysql/test/suite/rpl/t/rpl_000010-slave.opt 6801share/mysql/test/suite/rpl/t/rpl_000010-slave.opt
6788share/mysql/test/suite/rpl/t/rpl_000010.test 6802share/mysql/test/suite/rpl/t/rpl_000010.test
6789share/mysql/test/suite/rpl/t/rpl_000011.test 6803share/mysql/test/suite/rpl/t/rpl_000011.test
6790share/mysql/test/suite/rpl/t/rpl_000013.test 6804share/mysql/test/suite/rpl/t/rpl_000013.test
6791share/mysql/test/suite/rpl/t/rpl_000017.test 6805share/mysql/test/suite/rpl/t/rpl_000017.test
6792share/mysql/test/suite/rpl/t/rpl_4threads_deadlock.test 6806share/mysql/test/suite/rpl/t/rpl_4threads_deadlock.test
6793share/mysql/test/suite/rpl/t/rpl_DML_error.test 6807share/mysql/test/suite/rpl/t/rpl_DML_error.test
6794share/mysql/test/suite/rpl/t/rpl_EE_err.test 6808share/mysql/test/suite/rpl/t/rpl_EE_err.test
6795share/mysql/test/suite/rpl/t/rpl_LD_INFILE.test 6809share/mysql/test/suite/rpl/t/rpl_LD_INFILE.test
6796share/mysql/test/suite/rpl/t/rpl_alter.test 6810share/mysql/test/suite/rpl/t/rpl_alter.test
6797share/mysql/test/suite/rpl/t/rpl_alter_db.test 6811share/mysql/test/suite/rpl/t/rpl_alter_db.test
6798share/mysql/test/suite/rpl/t/rpl_alter_repository.test 6812share/mysql/test/suite/rpl/t/rpl_alter_repository.test
 6813share/mysql/test/suite/rpl/t/rpl_alter_user.test
6799share/mysql/test/suite/rpl/t/rpl_apply_binlog_with_anonymous_gtid.test 6814share/mysql/test/suite/rpl/t/rpl_apply_binlog_with_anonymous_gtid.test
6800share/mysql/test/suite/rpl/t/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.test 6815share/mysql/test/suite/rpl/t/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.test
6801share/mysql/test/suite/rpl/t/rpl_apply_binlog_with_gtid_when_gtid_mode_off.test 6816share/mysql/test/suite/rpl/t/rpl_apply_binlog_with_gtid_when_gtid_mode_off.test
6802share/mysql/test/suite/rpl/t/rpl_auto_increment-master.opt 6817share/mysql/test/suite/rpl/t/rpl_auto_increment-master.opt
6803share/mysql/test/suite/rpl/t/rpl_auto_increment.test 6818share/mysql/test/suite/rpl/t/rpl_auto_increment.test
6804share/mysql/test/suite/rpl/t/rpl_auto_increment_11932.test 6819share/mysql/test/suite/rpl/t/rpl_auto_increment_11932.test
6805share/mysql/test/suite/rpl/t/rpl_auto_increment_bug33029.test 6820share/mysql/test/suite/rpl/t/rpl_auto_increment_bug33029.test
6806share/mysql/test/suite/rpl/t/rpl_auto_increment_bug45679.test 6821share/mysql/test/suite/rpl/t/rpl_auto_increment_bug45679.test
6807share/mysql/test/suite/rpl/t/rpl_auto_increment_update_failure.test 6822share/mysql/test/suite/rpl/t/rpl_auto_increment_update_failure.test
6808share/mysql/test/suite/rpl/t/rpl_autogen_query_multi_byte_char.test 6823share/mysql/test/suite/rpl/t/rpl_autogen_query_multi_byte_char.test
6809share/mysql/test/suite/rpl/t/rpl_autoinc_lock_style.test 6824share/mysql/test/suite/rpl/t/rpl_autoinc_lock_style.test
6810share/mysql/test/suite/rpl/t/rpl_avoid_temporal_upgrade.test 6825share/mysql/test/suite/rpl/t/rpl_avoid_temporal_upgrade.test
6811share/mysql/test/suite/rpl/t/rpl_begin_commit_rollback-master.opt 6826share/mysql/test/suite/rpl/t/rpl_begin_commit_rollback-master.opt
@@ -7318,26 +7333,27 @@ share/mysql/test/suite/rpl/t/rpl_row_tab @@ -7318,26 +7333,27 @@ share/mysql/test/suite/rpl/t/rpl_row_tab
7318share/mysql/test/suite/rpl/t/rpl_row_tbl_metadata.test 7333share/mysql/test/suite/rpl/t/rpl_row_tbl_metadata.test
7319share/mysql/test/suite/rpl/t/rpl_row_trig001.test 7334share/mysql/test/suite/rpl/t/rpl_row_trig001.test
7320share/mysql/test/suite/rpl/t/rpl_row_trig002.test 7335share/mysql/test/suite/rpl/t/rpl_row_trig002.test
7321share/mysql/test/suite/rpl/t/rpl_row_trig003.test 7336share/mysql/test/suite/rpl/t/rpl_row_trig003.test
7322share/mysql/test/suite/rpl/t/rpl_row_trig004.test 7337share/mysql/test/suite/rpl/t/rpl_row_trig004.test
7323share/mysql/test/suite/rpl/t/rpl_row_trunc_temp.test 7338share/mysql/test/suite/rpl/t/rpl_row_trunc_temp.test
7324share/mysql/test/suite/rpl/t/rpl_row_unsafe_funcs.test 7339share/mysql/test/suite/rpl/t/rpl_row_unsafe_funcs.test
7325share/mysql/test/suite/rpl/t/rpl_row_until.test 7340share/mysql/test/suite/rpl/t/rpl_row_until.test
7326share/mysql/test/suite/rpl/t/rpl_row_utf16.test 7341share/mysql/test/suite/rpl/t/rpl_row_utf16.test
7327share/mysql/test/suite/rpl/t/rpl_row_utf32.test 7342share/mysql/test/suite/rpl/t/rpl_row_utf32.test
7328share/mysql/test/suite/rpl/t/rpl_row_view01.test 7343share/mysql/test/suite/rpl/t/rpl_row_view01.test
7329share/mysql/test/suite/rpl/t/rpl_row_wide_table.test 7344share/mysql/test/suite/rpl/t/rpl_row_wide_table.test
7330share/mysql/test/suite/rpl/t/rpl_savepoint.test 7345share/mysql/test/suite/rpl/t/rpl_savepoint.test
 7346share/mysql/test/suite/rpl/t/rpl_sbm_fake_rotate_event.test
7331share/mysql/test/suite/rpl/t/rpl_sbm_previous_gtid_event-slave.opt 7347share/mysql/test/suite/rpl/t/rpl_sbm_previous_gtid_event-slave.opt
7332share/mysql/test/suite/rpl/t/rpl_sbm_previous_gtid_event.test 7348share/mysql/test/suite/rpl/t/rpl_sbm_previous_gtid_event.test
7333share/mysql/test/suite/rpl/t/rpl_seconds_behind_master.test 7349share/mysql/test/suite/rpl/t/rpl_seconds_behind_master.test
7334share/mysql/test/suite/rpl/t/rpl_semi_sync-master.opt 7350share/mysql/test/suite/rpl/t/rpl_semi_sync-master.opt
7335share/mysql/test/suite/rpl/t/rpl_semi_sync-slave.opt 7351share/mysql/test/suite/rpl/t/rpl_semi_sync-slave.opt
7336share/mysql/test/suite/rpl/t/rpl_semi_sync.test 7352share/mysql/test/suite/rpl/t/rpl_semi_sync.test
7337share/mysql/test/suite/rpl/t/rpl_semi_sync_deadlock-master.opt 7353share/mysql/test/suite/rpl/t/rpl_semi_sync_deadlock-master.opt
7338share/mysql/test/suite/rpl/t/rpl_semi_sync_deadlock-slave.opt 7354share/mysql/test/suite/rpl/t/rpl_semi_sync_deadlock-slave.opt
7339share/mysql/test/suite/rpl/t/rpl_semi_sync_deadlock.test 7355share/mysql/test/suite/rpl/t/rpl_semi_sync_deadlock.test
7340share/mysql/test/suite/rpl/t/rpl_semi_sync_event-master.opt 7356share/mysql/test/suite/rpl/t/rpl_semi_sync_event-master.opt
7341share/mysql/test/suite/rpl/t/rpl_semi_sync_event-slave.opt 7357share/mysql/test/suite/rpl/t/rpl_semi_sync_event-slave.opt
7342share/mysql/test/suite/rpl/t/rpl_semi_sync_event.test 7358share/mysql/test/suite/rpl/t/rpl_semi_sync_event.test
7343share/mysql/test/suite/rpl/t/rpl_semi_sync_future_logpos-master.opt 7359share/mysql/test/suite/rpl/t/rpl_semi_sync_future_logpos-master.opt