Mon Apr 14 17:14:14 2014 UTC ()
Pullup ticket #4374 - requested by taca
databases/mysql56-client: security update
databases/mysql56-server: update to keep in sync with with "mysql56-client"

Revisions pulled up:
- databases/mysql56-client/Makefile.common                      1.14
- databases/mysql56-client/distinfo                             1.14
- databases/mysql56-server/PLIST                                1.9

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Mon Mar 31 10:32:13 UTC 2014

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

   Log Message:
   Changes 5.6.17:

   Functionality Added or Changed

   Incompatible Change: The AES_ENCRYPT() and AES_DECRYPT() functions now permit control of the block encryption mode and take an optional initialization vector argument:

   The new block_encryption_mode system variable controls the mode for block-based encryption algorithms. Its default value is aes-128-ecb, which signifies encryption using a key length of 128 bits and ECB mode.

   An optional init_vector argument provides an initialization vector for encryption modes that require it:

   AES_ENCRYPT(str,key_str[,init_vector])
   AES_DECRYPT(crypt_str,key_str[,init_vector])
   A random string of bytes to use for the initialization vector can be produced by calling the new RANDOM_BYTES() function.

   For more information, see Encryption and Compression Functions.

   These changes make statements that use AES_ENCRYPT() or AES_DECRYPT() unsafe for statement-based replication and they cannot be stored in the query cache. Queries that use RANDOM_BYTES() are unsafe for statement-based replication and cannot be stored in the query cache.

   Incompatible Change: The ERROR_FOR_DIVISION_BY_ZERO, NO_ZERO_DATE, and NO_ZERO_IN_DATE SQL modes now are deprecated and setting the sql_mode value to include any of them generates a warning. In MySQL 5.7, these modes do nothing. Instead, their effects are included in the effects of strict SQL mode (STRICT_ALL_TABLES or STRICT_TRANS_TABLES). The motivation for the change in MySQL 5.7 is to reduce the number of SQL modes with an effect dependent on strict mode and make them part of strict mode itself.

   To make advance preparation for an upgrade to MySQL 5.7, see SQL Mode Changes in MySQL 5.7. That discussion provides guidelines to assess whether your applications will be affected by the SQL mode changes in MySQL 5.7.

   InnoDB: MySQL now supports rebuilding regular and partitioned InnoDB tables using online DDL (ALGORITHM=INPLACE) for the following operations:

   OPTIMIZE TABLE

   ALTER TABLE ... FORCE

   ALTER TABLE ... ENGINE=INNODB (when run on an InnoDB table)

   Online DDL support reduces table rebuild time and permits concurrent DML, which helps reduce user application downtime. For additional information, see Overview of Online DDL.

   On Solaris, mysql_config --libs now includes -R/path/to/library so that libraries can be found at runtime.

   mysql_install_db provides a more informative diagnostic message when required Perl modules are missing.

   The IGNORE clause for ALTER TABLE is now deprecated and will be removed in a future version of MySQL. ALTER IGNORE TABLE causes problems for replication, prevents online ALTER TABLE for unique index creation, and causes problems with foreign keys (rows removed in the parent table).

   Bugs Fixed


(tron)
diff -r1.13 -r1.13.2.1 pkgsrc/databases/mysql56-client/Makefile.common
diff -r1.13 -r1.13.2.1 pkgsrc/databases/mysql56-client/distinfo
diff -r1.8 -r1.8.2.1 pkgsrc/databases/mysql56-server/PLIST

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

--- pkgsrc/databases/mysql56-client/Makefile.common 2014/02/13 07:49:56 1.13
+++ pkgsrc/databases/mysql56-client/Makefile.common 2014/04/14 17:14:13 1.13.2.1
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile.common,v 1.13 2014/02/13 07:49:56 adam Exp $ 1# $NetBSD: Makefile.common,v 1.13.2.1 2014/04/14 17:14:13 tron 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.16 6DISTNAME= mysql-5.6.17
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.13 -r1.13.2.1 pkgsrc/databases/mysql56-client/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-client/distinfo 2014/02/13 14:38:08 1.13
+++ pkgsrc/databases/mysql56-client/distinfo 2014/04/14 17:14:13 1.13.2.1
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.13 2014/02/13 14:38:08 jperkin Exp $ 1$NetBSD: distinfo,v 1.13.2.1 2014/04/14 17:14:13 tron Exp $
2 2
3SHA1 (mysql-5.6.16.tar.gz) = 64a3b4058e2039d2b812d23c8793f74b4f168cc0 3SHA1 (mysql-5.6.17.tar.gz) = 53773d619d7f7bc1743f92fd65885a0581c37ff8
4RMD160 (mysql-5.6.16.tar.gz) = 11d21eb50e63776876dccf3a72e19e5de4eec9c2 4RMD160 (mysql-5.6.17.tar.gz) = 8bee91a701210d846d1f9523d948a86891873a15
5Size (mysql-5.6.16.tar.gz) = 32821451 bytes 5Size (mysql-5.6.17.tar.gz) = 32862539 bytes
6SHA1 (patch-CMakeLists.txt) = b3d0bfc9a23ddbb1ea415e16c35c86e190857bba 6SHA1 (patch-CMakeLists.txt) = b3d0bfc9a23ddbb1ea415e16c35c86e190857bba
7SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb 7SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
8SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93 8SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
9SHA1 (patch-client_sql_string.h) = f26aff4ce4cf6dfef44c85ef95120331ca8fef52 9SHA1 (patch-client_sql_string.h) = f26aff4ce4cf6dfef44c85ef95120331ca8fef52
10SHA1 (patch-cmake_dtrace.cmake) = e54867464be28ec05534c9b3c38fd54533f652fb 10SHA1 (patch-cmake_dtrace.cmake) = e54867464be28ec05534c9b3c38fd54533f652fb
11SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356 11SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356
12SHA1 (patch-cmake_plugin.cmake) = 03e7a7debd61e870bd76d5c5b253a620662b3595 12SHA1 (patch-cmake_plugin.cmake) = 03e7a7debd61e870bd76d5c5b253a620662b3595
13SHA1 (patch-cmake_readline.cmake) = f1ec8ccbebb5b7851199bec457d4029c8a9e63dc 13SHA1 (patch-cmake_readline.cmake) = f1ec8ccbebb5b7851199bec457d4029c8a9e63dc
14SHA1 (patch-cmake_ssl.cmake) = a5a25b00010c6586e5a3e099975ddabe369d4247 14SHA1 (patch-cmake_ssl.cmake) = a5a25b00010c6586e5a3e099975ddabe369d4247
15SHA1 (patch-include_CMakeLists.txt) = 49d351a958e63c69ad8bfe5c50961fe3751e86c4 15SHA1 (patch-include_CMakeLists.txt) = 49d351a958e63c69ad8bfe5c50961fe3751e86c4
16SHA1 (patch-include_my__global.h) = 843b9527faf880eee59cf02239ba601f5985ddfb 16SHA1 (patch-include_my__global.h) = 843b9527faf880eee59cf02239ba601f5985ddfb
17SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5 17SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5
18SHA1 (patch-include_my_net.h) = b08aa36921efd023f9ecaac4cd3fb8a16d200abd 18SHA1 (patch-include_my_net.h) = b08aa36921efd023f9ecaac4cd3fb8a16d200abd

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

--- pkgsrc/databases/mysql56-server/PLIST 2014/03/11 14:05:00 1.8
+++ pkgsrc/databases/mysql56-server/PLIST 2014/04/14 17:14:13 1.8.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.8 2014/03/11 14:05:00 jperkin Exp $ 1@comment $NetBSD: PLIST,v 1.8.2.1 2014/04/14 17:14:13 tron 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
@@ -211,102 +211,115 @@ share/mysql/test/extra/binlog_tests/ctyp @@ -211,102 +211,115 @@ share/mysql/test/extra/binlog_tests/ctyp
211share/mysql/test/extra/binlog_tests/database.test 211share/mysql/test/extra/binlog_tests/database.test
212share/mysql/test/extra/binlog_tests/drop_table.test 212share/mysql/test/extra/binlog_tests/drop_table.test
213share/mysql/test/extra/binlog_tests/drop_temp_table.test 213share/mysql/test/extra/binlog_tests/drop_temp_table.test
214share/mysql/test/extra/binlog_tests/implicit.test 214share/mysql/test/extra/binlog_tests/implicit.test
215share/mysql/test/extra/binlog_tests/insert_select-binlog.test 215share/mysql/test/extra/binlog_tests/insert_select-binlog.test
216share/mysql/test/extra/binlog_tests/mix_innodb_myisam_binlog.test 216share/mysql/test/extra/binlog_tests/mix_innodb_myisam_binlog.test
217share/mysql/test/extra/binlog_tests/mix_innodb_myisam_side_effects.test 217share/mysql/test/extra/binlog_tests/mix_innodb_myisam_side_effects.test
218share/mysql/test/extra/binlog_tests/mysqlbinlog_row_engine.inc 218share/mysql/test/extra/binlog_tests/mysqlbinlog_row_engine.inc
219share/mysql/test/extra/binlog_tests/mysqlbinlog_start_stop_1.inc 219share/mysql/test/extra/binlog_tests/mysqlbinlog_start_stop_1.inc
220share/mysql/test/extra/binlog_tests/mysqlbinlog_start_stop_2.inc 220share/mysql/test/extra/binlog_tests/mysqlbinlog_start_stop_2.inc
221share/mysql/test/extra/rpl_tests/check_type.inc 221share/mysql/test/extra/rpl_tests/check_type.inc
222share/mysql/test/extra/rpl_tests/create_recursive_construct.inc 222share/mysql/test/extra/rpl_tests/create_recursive_construct.inc
223share/mysql/test/extra/rpl_tests/delayed_slave_wait_on_query.inc 223share/mysql/test/extra/rpl_tests/delayed_slave_wait_on_query.inc
 224share/mysql/test/extra/rpl_tests/grep_pattern.inc
224share/mysql/test/extra/rpl_tests/rpl_EE_err.test 225share/mysql/test/extra/rpl_tests/rpl_EE_err.test
225share/mysql/test/extra/rpl_tests/rpl_auto_increment.test 226share/mysql/test/extra/rpl_tests/rpl_auto_increment.test
226share/mysql/test/extra/rpl_tests/rpl_auto_increment_insert_view.test 227share/mysql/test/extra/rpl_tests/rpl_auto_increment_insert_view.test
227share/mysql/test/extra/rpl_tests/rpl_auto_increment_invoke_trigger.test 228share/mysql/test/extra/rpl_tests/rpl_auto_increment_invoke_trigger.test
228share/mysql/test/extra/rpl_tests/rpl_autoinc_func_invokes_trigger.test 229share/mysql/test/extra/rpl_tests/rpl_autoinc_func_invokes_trigger.test
 230share/mysql/test/extra/rpl_tests/rpl_binlog_error.inc
229share/mysql/test/extra/rpl_tests/rpl_binlog_max_cache_size.test 231share/mysql/test/extra/rpl_tests/rpl_binlog_max_cache_size.test
230share/mysql/test/extra/rpl_tests/rpl_blackhole.test 232share/mysql/test/extra/rpl_tests/rpl_blackhole.test
231share/mysql/test/extra/rpl_tests/rpl_change_master.test 233share/mysql/test/extra/rpl_tests/rpl_change_master.test
232share/mysql/test/extra/rpl_tests/rpl_change_master_bind.inc 234share/mysql/test/extra/rpl_tests/rpl_change_master_bind.inc
233share/mysql/test/extra/rpl_tests/rpl_charset.test 235share/mysql/test/extra/rpl_tests/rpl_charset.test
234share/mysql/test/extra/rpl_tests/rpl_check_gtid.inc 236share/mysql/test/extra/rpl_tests/rpl_check_gtid.inc
235share/mysql/test/extra/rpl_tests/rpl_commit_after_flush.test 237share/mysql/test/extra/rpl_tests/rpl_commit_after_flush.test
236share/mysql/test/extra/rpl_tests/rpl_conflicts.test 238share/mysql/test/extra/rpl_tests/rpl_conflicts.test
237share/mysql/test/extra/rpl_tests/rpl_crash_safe.inc 239share/mysql/test/extra/rpl_tests/rpl_crash_safe.inc
238share/mysql/test/extra/rpl_tests/rpl_crash_safe.test 240share/mysql/test/extra/rpl_tests/rpl_crash_safe.test
239share/mysql/test/extra/rpl_tests/rpl_ddl.test 241share/mysql/test/extra/rpl_tests/rpl_ddl.test
240share/mysql/test/extra/rpl_tests/rpl_deadlock.test 242share/mysql/test/extra/rpl_tests/rpl_deadlock.test
241share/mysql/test/extra/rpl_tests/rpl_delete_no_where.test 243share/mysql/test/extra/rpl_tests/rpl_delete_no_where.test
 244share/mysql/test/extra/rpl_tests/rpl_do_table_filter_insensitive.inc
 245share/mysql/test/extra/rpl_tests/rpl_do_table_filter_sensitive.inc
242share/mysql/test/extra/rpl_tests/rpl_drop_create_temp_table.inc 246share/mysql/test/extra/rpl_tests/rpl_drop_create_temp_table.inc
243share/mysql/test/extra/rpl_tests/rpl_drop_create_temp_table.test 247share/mysql/test/extra/rpl_tests/rpl_drop_create_temp_table.test
244share/mysql/test/extra/rpl_tests/rpl_extra_col_master.test 248share/mysql/test/extra/rpl_tests/rpl_extra_col_master.test
245share/mysql/test/extra/rpl_tests/rpl_extra_col_slave.test 249share/mysql/test/extra/rpl_tests/rpl_extra_col_slave.test
246share/mysql/test/extra/rpl_tests/rpl_failed_optimize.test 250share/mysql/test/extra/rpl_tests/rpl_failed_optimize.test
247share/mysql/test/extra/rpl_tests/rpl_filters.test 251share/mysql/test/extra/rpl_tests/rpl_filters.test
248share/mysql/test/extra/rpl_tests/rpl_flsh_tbls.test 252share/mysql/test/extra/rpl_tests/rpl_flsh_tbls.test
249share/mysql/test/extra/rpl_tests/rpl_foreign_key.test 253share/mysql/test/extra/rpl_tests/rpl_foreign_key.test
250share/mysql/test/extra/rpl_tests/rpl_get_master_version_and_clock.test 254share/mysql/test/extra/rpl_tests/rpl_get_master_version_and_clock.test
 255share/mysql/test/extra/rpl_tests/rpl_heartbeat_2slaves.inc
 256share/mysql/test/extra/rpl_tests/rpl_ignore_table_filter_insensitive.inc
 257share/mysql/test/extra/rpl_tests/rpl_ignore_table_filter_sensitive.inc
251share/mysql/test/extra/rpl_tests/rpl_implicit_commit_binlog.test 258share/mysql/test/extra/rpl_tests/rpl_implicit_commit_binlog.test
252share/mysql/test/extra/rpl_tests/rpl_innodb.test 259share/mysql/test/extra/rpl_tests/rpl_innodb.test
253share/mysql/test/extra/rpl_tests/rpl_insert_delayed.test 260share/mysql/test/extra/rpl_tests/rpl_insert_delayed.test
254share/mysql/test/extra/rpl_tests/rpl_insert_id.test 261share/mysql/test/extra/rpl_tests/rpl_insert_id.test
255share/mysql/test/extra/rpl_tests/rpl_insert_id_pk.test 262share/mysql/test/extra/rpl_tests/rpl_insert_id_pk.test
256share/mysql/test/extra/rpl_tests/rpl_insert_ignore.test 263share/mysql/test/extra/rpl_tests/rpl_insert_ignore.test
 264share/mysql/test/extra/rpl_tests/rpl_insert_ignore_gtid_on.inc
257share/mysql/test/extra/rpl_tests/rpl_loaddata.test 265share/mysql/test/extra/rpl_tests/rpl_loaddata.test
 266share/mysql/test/extra/rpl_tests/rpl_loaddata_s.inc
258share/mysql/test/extra/rpl_tests/rpl_loadfile.test 267share/mysql/test/extra/rpl_tests/rpl_loadfile.test
259share/mysql/test/extra/rpl_tests/rpl_log.test 268share/mysql/test/extra/rpl_tests/rpl_log.test
260share/mysql/test/extra/rpl_tests/rpl_lower_case_table_names.test 269share/mysql/test/extra/rpl_tests/rpl_lower_case_table_names.test
261share/mysql/test/extra/rpl_tests/rpl_max_relay_size.test 270share/mysql/test/extra/rpl_tests/rpl_max_relay_size.test
262share/mysql/test/extra/rpl_tests/rpl_mixing_engines.inc 271share/mysql/test/extra/rpl_tests/rpl_mixing_engines.inc
263share/mysql/test/extra/rpl_tests/rpl_mixing_engines.test 272share/mysql/test/extra/rpl_tests/rpl_mixing_engines.test
264share/mysql/test/extra/rpl_tests/rpl_mts_crash_safe.inc 273share/mysql/test/extra/rpl_tests/rpl_mts_crash_safe.inc
265share/mysql/test/extra/rpl_tests/rpl_mts_crash_safe.test 274share/mysql/test/extra/rpl_tests/rpl_mts_crash_safe.test
266share/mysql/test/extra/rpl_tests/rpl_multi_query.test 275share/mysql/test/extra/rpl_tests/rpl_multi_query.test
267share/mysql/test/extra/rpl_tests/rpl_multi_update.test 276share/mysql/test/extra/rpl_tests/rpl_multi_update.test
268share/mysql/test/extra/rpl_tests/rpl_multi_update2.test 277share/mysql/test/extra/rpl_tests/rpl_multi_update2.test
269share/mysql/test/extra/rpl_tests/rpl_multi_update3.test 278share/mysql/test/extra/rpl_tests/rpl_multi_update3.test
270share/mysql/test/extra/rpl_tests/rpl_not_null.test 279share/mysql/test/extra/rpl_tests/rpl_not_null.test
271share/mysql/test/extra/rpl_tests/rpl_parallel_load.test 280share/mysql/test/extra/rpl_tests/rpl_parallel_load.test
272share/mysql/test/extra/rpl_tests/rpl_parallel_load_innodb.test 281share/mysql/test/extra/rpl_tests/rpl_parallel_load_innodb.test
273share/mysql/test/extra/rpl_tests/rpl_partition.test 282share/mysql/test/extra/rpl_tests/rpl_partition.test
274share/mysql/test/extra/rpl_tests/rpl_record_compare.test 283share/mysql/test/extra/rpl_tests/rpl_record_compare.test
275share/mysql/test/extra/rpl_tests/rpl_relayrotate.test 284share/mysql/test/extra/rpl_tests/rpl_relayrotate.test
276share/mysql/test/extra/rpl_tests/rpl_reset_slave.test 285share/mysql/test/extra/rpl_tests/rpl_reset_slave.test
277share/mysql/test/extra/rpl_tests/rpl_row_001.test 286share/mysql/test/extra/rpl_tests/rpl_row_001.test
278share/mysql/test/extra/rpl_tests/rpl_row_UUID.test 287share/mysql/test/extra/rpl_tests/rpl_row_UUID.test
279share/mysql/test/extra/rpl_tests/rpl_row_basic.test 288share/mysql/test/extra/rpl_tests/rpl_row_basic.test
280share/mysql/test/extra/rpl_tests/rpl_row_blob.test 289share/mysql/test/extra/rpl_tests/rpl_row_blob.test
281share/mysql/test/extra/rpl_tests/rpl_row_delayed_ins.test 290share/mysql/test/extra/rpl_tests/rpl_row_delayed_ins.test
282share/mysql/test/extra/rpl_tests/rpl_row_empty_imgs.test 291share/mysql/test/extra/rpl_tests/rpl_row_empty_imgs.test
 292share/mysql/test/extra/rpl_tests/rpl_row_event_max_size.inc
283share/mysql/test/extra/rpl_tests/rpl_row_func003.test 293share/mysql/test/extra/rpl_tests/rpl_row_func003.test
284share/mysql/test/extra/rpl_tests/rpl_row_idempotency.test 294share/mysql/test/extra/rpl_tests/rpl_row_idempotency.test
285share/mysql/test/extra/rpl_tests/rpl_row_img.test 295share/mysql/test/extra/rpl_tests/rpl_row_img.test
286share/mysql/test/extra/rpl_tests/rpl_row_img_blobs.test 296share/mysql/test/extra/rpl_tests/rpl_row_img_blobs.test
287share/mysql/test/extra/rpl_tests/rpl_row_img_diff_indexes.test 297share/mysql/test/extra/rpl_tests/rpl_row_img_diff_indexes.test
 298share/mysql/test/extra/rpl_tests/rpl_row_show_relaylog_events.inc
288share/mysql/test/extra/rpl_tests/rpl_row_sp002.test 299share/mysql/test/extra/rpl_tests/rpl_row_sp002.test
289share/mysql/test/extra/rpl_tests/rpl_row_sp003.test 300share/mysql/test/extra/rpl_tests/rpl_row_sp003.test
290share/mysql/test/extra/rpl_tests/rpl_row_sp006.test 301share/mysql/test/extra/rpl_tests/rpl_row_sp006.test
291share/mysql/test/extra/rpl_tests/rpl_row_sp007.test 302share/mysql/test/extra/rpl_tests/rpl_row_sp007.test
292share/mysql/test/extra/rpl_tests/rpl_row_tabledefs.test 303share/mysql/test/extra/rpl_tests/rpl_row_tabledefs.test
293share/mysql/test/extra/rpl_tests/rpl_set_null.test 304share/mysql/test/extra/rpl_tests/rpl_set_null.test
294share/mysql/test/extra/rpl_tests/rpl_show_binlog_events.inc 305share/mysql/test/extra/rpl_tests/rpl_show_binlog_events.inc
295share/mysql/test/extra/rpl_tests/rpl_show_log_events_with_varying_options.inc 306share/mysql/test/extra/rpl_tests/rpl_show_log_events_with_varying_options.inc
296share/mysql/test/extra/rpl_tests/rpl_show_relaylog_events.inc 307share/mysql/test/extra/rpl_tests/rpl_show_relaylog_events.inc
297share/mysql/test/extra/rpl_tests/rpl_start_stop_slave.test 308share/mysql/test/extra/rpl_tests/rpl_start_stop_slave.test
298share/mysql/test/extra/rpl_tests/rpl_stm_EE_err2.test 309share/mysql/test/extra/rpl_tests/rpl_stm_EE_err2.test
299share/mysql/test/extra/rpl_tests/rpl_stm_create_if_not_exists.test 310share/mysql/test/extra/rpl_tests/rpl_stm_create_if_not_exists.test
 311share/mysql/test/extra/rpl_tests/rpl_stm_insert_delayed.inc
 312share/mysql/test/extra/rpl_tests/rpl_stm_mix_show_relaylog_events.inc
300share/mysql/test/extra/rpl_tests/rpl_stop_middle_group.test 313share/mysql/test/extra/rpl_tests/rpl_stop_middle_group.test
301share/mysql/test/extra/rpl_tests/rpl_stop_slave.test 314share/mysql/test/extra/rpl_tests/rpl_stop_slave.test
302share/mysql/test/extra/rpl_tests/rpl_stress_test.inc 315share/mysql/test/extra/rpl_tests/rpl_stress_test.inc
303share/mysql/test/extra/rpl_tests/rpl_sv_relay_space.test 316share/mysql/test/extra/rpl_tests/rpl_sv_relay_space.test
304share/mysql/test/extra/rpl_tests/rpl_temp_error.test 317share/mysql/test/extra/rpl_tests/rpl_temp_error.test
305share/mysql/test/extra/rpl_tests/rpl_test_framework.inc 318share/mysql/test/extra/rpl_tests/rpl_test_framework.inc
306share/mysql/test/extra/rpl_tests/rpl_tmp_table_and_DDL.test 319share/mysql/test/extra/rpl_tests/rpl_tmp_table_and_DDL.test
307share/mysql/test/extra/rpl_tests/rpl_trig004.test 320share/mysql/test/extra/rpl_tests/rpl_trig004.test
308share/mysql/test/extra/rpl_tests/rpl_truncate.test 321share/mysql/test/extra/rpl_tests/rpl_truncate.test
309share/mysql/test/extra/rpl_tests/rpl_truncate_helper.test 322share/mysql/test/extra/rpl_tests/rpl_truncate_helper.test
310share/mysql/test/extra/rpl_tests/type_conversions.test 323share/mysql/test/extra/rpl_tests/type_conversions.test
311share/mysql/test/include/Load_data.inc 324share/mysql/test/include/Load_data.inc
312share/mysql/test/include/add_anonymous_users.inc 325share/mysql/test/include/add_anonymous_users.inc
@@ -383,26 +396,27 @@ share/mysql/test/include/diff_tables.inc @@ -383,26 +396,27 @@ share/mysql/test/include/diff_tables.inc
383share/mysql/test/include/end_include_file.inc 396share/mysql/test/include/end_include_file.inc
384share/mysql/test/include/endspace.inc 397share/mysql/test/include/endspace.inc
385share/mysql/test/include/eval.inc 398share/mysql/test/include/eval.inc
386share/mysql/test/include/execute_with_statistics.inc 399share/mysql/test/include/execute_with_statistics.inc
387share/mysql/test/include/expect_qep.inc 400share/mysql/test/include/expect_qep.inc
388share/mysql/test/include/explain.inc 401share/mysql/test/include/explain.inc
389share/mysql/test/include/explain_json.inc 402share/mysql/test/include/explain_json.inc
390share/mysql/test/include/explain_non_select.inc 403share/mysql/test/include/explain_non_select.inc
391share/mysql/test/include/explain_utils.inc 404share/mysql/test/include/explain_utils.inc
392share/mysql/test/include/file_does_not_exist.inc 405share/mysql/test/include/file_does_not_exist.inc
393share/mysql/test/include/filter_file.inc 406share/mysql/test/include/filter_file.inc
394share/mysql/test/include/force_restart.inc 407share/mysql/test/include/force_restart.inc
395share/mysql/test/include/force_restart_if_skipped.inc 408share/mysql/test/include/force_restart_if_skipped.inc
 409share/mysql/test/include/func_aes_block.inc
396share/mysql/test/include/func_in.inc 410share/mysql/test/include/func_in.inc
397share/mysql/test/include/function_defaults.inc 411share/mysql/test/include/function_defaults.inc
398share/mysql/test/include/function_defaults_notembedded.inc 412share/mysql/test/include/function_defaults_notembedded.inc
399share/mysql/test/include/get_relay_log_pos.inc 413share/mysql/test/include/get_relay_log_pos.inc
400share/mysql/test/include/gis_debug.inc 414share/mysql/test/include/gis_debug.inc
401share/mysql/test/include/gis_generic.inc 415share/mysql/test/include/gis_generic.inc
402share/mysql/test/include/gis_keys.inc 416share/mysql/test/include/gis_keys.inc
403share/mysql/test/include/grant_cache.inc 417share/mysql/test/include/grant_cache.inc
404share/mysql/test/include/greedy_search_drop_tables.inc 418share/mysql/test/include/greedy_search_drop_tables.inc
405share/mysql/test/include/greedy_search_load_tables.inc 419share/mysql/test/include/greedy_search_load_tables.inc
406share/mysql/test/include/gtid_utils.inc 420share/mysql/test/include/gtid_utils.inc
407share/mysql/test/include/gtid_utils_end.inc 421share/mysql/test/include/gtid_utils_end.inc
408share/mysql/test/include/handler.inc 422share/mysql/test/include/handler.inc
@@ -974,26 +988,32 @@ share/mysql/test/r/flush_read_lock_kill. @@ -974,26 +988,32 @@ share/mysql/test/r/flush_read_lock_kill.
974share/mysql/test/r/flush_table.result 988share/mysql/test/r/flush_table.result
975share/mysql/test/r/foreign_key.result 989share/mysql/test/r/foreign_key.result
976share/mysql/test/r/fulltext.result 990share/mysql/test/r/fulltext.result
977share/mysql/test/r/fulltext2.result 991share/mysql/test/r/fulltext2.result
978share/mysql/test/r/fulltext3.result 992share/mysql/test/r/fulltext3.result
979share/mysql/test/r/fulltext_cache.result 993share/mysql/test/r/fulltext_cache.result
980share/mysql/test/r/fulltext_distinct.result 994share/mysql/test/r/fulltext_distinct.result
981share/mysql/test/r/fulltext_left_join.result 995share/mysql/test/r/fulltext_left_join.result
982share/mysql/test/r/fulltext_multi.result 996share/mysql/test/r/fulltext_multi.result
983share/mysql/test/r/fulltext_order_by.result 997share/mysql/test/r/fulltext_order_by.result
984share/mysql/test/r/fulltext_plugin.result 998share/mysql/test/r/fulltext_plugin.result
985share/mysql/test/r/fulltext_update.result 999share/mysql/test/r/fulltext_update.result
986share/mysql/test/r/fulltext_var.result 1000share/mysql/test/r/fulltext_var.result
 1001share/mysql/test/r/func_aes.result
 1002share/mysql/test/r/func_aes_cfb1.result
 1003share/mysql/test/r/func_aes_cfb128.result
 1004share/mysql/test/r/func_aes_cfb8.result
 1005share/mysql/test/r/func_aes_misc.result
 1006share/mysql/test/r/func_aes_ofb.result
987share/mysql/test/r/func_analyse.result 1007share/mysql/test/r/func_analyse.result
988share/mysql/test/r/func_compress.result 1008share/mysql/test/r/func_compress.result
989share/mysql/test/r/func_concat.result 1009share/mysql/test/r/func_concat.result
990share/mysql/test/r/func_crypt.result 1010share/mysql/test/r/func_crypt.result
991share/mysql/test/r/func_date_add.result 1011share/mysql/test/r/func_date_add.result
992share/mysql/test/r/func_default.result 1012share/mysql/test/r/func_default.result
993share/mysql/test/r/func_des_encrypt.result 1013share/mysql/test/r/func_des_encrypt.result
994share/mysql/test/r/func_digest.result 1014share/mysql/test/r/func_digest.result
995share/mysql/test/r/func_encrypt.result 1015share/mysql/test/r/func_encrypt.result
996share/mysql/test/r/func_encrypt_nossl.result 1016share/mysql/test/r/func_encrypt_nossl.result
997share/mysql/test/r/func_encrypt_ucs2.result 1017share/mysql/test/r/func_encrypt_ucs2.result
998share/mysql/test/r/func_equal.result 1018share/mysql/test/r/func_equal.result
999share/mysql/test/r/func_gconcat.result 1019share/mysql/test/r/func_gconcat.result
@@ -1325,26 +1345,28 @@ share/mysql/test/r/partition_cache.resul @@ -1325,26 +1345,28 @@ share/mysql/test/r/partition_cache.resul
1325share/mysql/test/r/partition_charset.result 1345share/mysql/test/r/partition_charset.result
1326share/mysql/test/r/partition_column.result 1346share/mysql/test/r/partition_column.result
1327share/mysql/test/r/partition_column_prune.result 1347share/mysql/test/r/partition_column_prune.result
1328share/mysql/test/r/partition_csv.result 1348share/mysql/test/r/partition_csv.result
1329share/mysql/test/r/partition_datatype.result 1349share/mysql/test/r/partition_datatype.result
1330share/mysql/test/r/partition_debug_sync.result 1350share/mysql/test/r/partition_debug_sync.result
1331share/mysql/test/r/partition_disabled.result 1351share/mysql/test/r/partition_disabled.result
1332share/mysql/test/r/partition_error.result 1352share/mysql/test/r/partition_error.result
1333share/mysql/test/r/partition_exchange.result 1353share/mysql/test/r/partition_exchange.result
1334share/mysql/test/r/partition_explicit_prune.result 1354share/mysql/test/r/partition_explicit_prune.result
1335share/mysql/test/r/partition_federated.result 1355share/mysql/test/r/partition_federated.result
1336share/mysql/test/r/partition_grant.result 1356share/mysql/test/r/partition_grant.result
1337share/mysql/test/r/partition_hash.result 1357share/mysql/test/r/partition_hash.result
 1358share/mysql/test/r/partition_index_innodb.result
 1359share/mysql/test/r/partition_index_myisam.result
1338share/mysql/test/r/partition_innodb.result 1360share/mysql/test/r/partition_innodb.result
1339share/mysql/test/r/partition_innodb_plugin.result 1361share/mysql/test/r/partition_innodb_plugin.result
1340share/mysql/test/r/partition_innodb_semi_consistent.result 1362share/mysql/test/r/partition_innodb_semi_consistent.result
1341share/mysql/test/r/partition_innodb_stmt.result 1363share/mysql/test/r/partition_innodb_stmt.result
1342share/mysql/test/r/partition_innodb_tablespace.result 1364share/mysql/test/r/partition_innodb_tablespace.result
1343share/mysql/test/r/partition_key_cache.result 1365share/mysql/test/r/partition_key_cache.result
1344share/mysql/test/r/partition_list.result 1366share/mysql/test/r/partition_list.result
1345share/mysql/test/r/partition_locking.result 1367share/mysql/test/r/partition_locking.result
1346share/mysql/test/r/partition_locking_4.result 1368share/mysql/test/r/partition_locking_4.result
1347share/mysql/test/r/partition_mgm.result 1369share/mysql/test/r/partition_mgm.result
1348share/mysql/test/r/partition_mgm_err.result 1370share/mysql/test/r/partition_mgm_err.result
1349share/mysql/test/r/partition_mgm_err2.result 1371share/mysql/test/r/partition_mgm_err2.result
1350share/mysql/test/r/partition_myisam.result 1372share/mysql/test/r/partition_myisam.result
@@ -3331,67 +3353,71 @@ share/mysql/test/suite/funcs_2/lib/gen_c @@ -3331,67 +3353,71 @@ share/mysql/test/suite/funcs_2/lib/gen_c
3331share/mysql/test/suite/funcs_2/r/innodb_charset.result 3353share/mysql/test/suite/funcs_2/r/innodb_charset.result
3332share/mysql/test/suite/funcs_2/r/memory_charset.result 3354share/mysql/test/suite/funcs_2/r/memory_charset.result
3333share/mysql/test/suite/funcs_2/r/myisam_charset.result 3355share/mysql/test/suite/funcs_2/r/myisam_charset.result
3334share/mysql/test/suite/funcs_2/readme.txt 3356share/mysql/test/suite/funcs_2/readme.txt
3335share/mysql/test/suite/funcs_2/t/disabled.def 3357share/mysql/test/suite/funcs_2/t/disabled.def
3336share/mysql/test/suite/funcs_2/t/innodb_charset.test 3358share/mysql/test/suite/funcs_2/t/innodb_charset.test
3337share/mysql/test/suite/funcs_2/t/memory_charset.test 3359share/mysql/test/suite/funcs_2/t/memory_charset.test
3338share/mysql/test/suite/funcs_2/t/myisam_charset.test 3360share/mysql/test/suite/funcs_2/t/myisam_charset.test
3339share/mysql/test/suite/funcs_2/t/suite.opt 3361share/mysql/test/suite/funcs_2/t/suite.opt
3340share/mysql/test/suite/innodb/include/innodb_dict.inc 3362share/mysql/test/suite/innodb/include/innodb_dict.inc
3341share/mysql/test/suite/innodb/include/innodb_stats.inc 3363share/mysql/test/suite/innodb/include/innodb_stats.inc
3342share/mysql/test/suite/innodb/include/innodb_stats_table_flag.inc 3364share/mysql/test/suite/innodb/include/innodb_stats_table_flag.inc
3343share/mysql/test/suite/innodb/include/innodb_stats_table_flag_analyze.inc 3365share/mysql/test/suite/innodb/include/innodb_stats_table_flag_analyze.inc
 3366share/mysql/test/suite/innodb/r/blob-update-debug.result
 3367share/mysql/test/suite/innodb/r/create-index.result
3344share/mysql/test/suite/innodb/r/innodb-2byte-collation.result 3368share/mysql/test/suite/innodb/r/innodb-2byte-collation.result
3345share/mysql/test/suite/innodb/r/innodb-ac-non-locking-select.result 3369share/mysql/test/suite/innodb/r/innodb-ac-non-locking-select.result
3346share/mysql/test/suite/innodb/r/innodb-alter-autoinc.result 3370share/mysql/test/suite/innodb/r/innodb-alter-autoinc.result
3347share/mysql/test/suite/innodb/r/innodb-alter-debug.result 3371share/mysql/test/suite/innodb/r/innodb-alter-debug.result
3348share/mysql/test/suite/innodb/r/innodb-alter-discard.result 3372share/mysql/test/suite/innodb/r/innodb-alter-discard.result
3349share/mysql/test/suite/innodb/r/innodb-alter-nullable.result 3373share/mysql/test/suite/innodb/r/innodb-alter-nullable.result
3350share/mysql/test/suite/innodb/r/innodb-alter.result 3374share/mysql/test/suite/innodb/r/innodb-alter.result
3351share/mysql/test/suite/innodb/r/innodb-analyze.result 3375share/mysql/test/suite/innodb/r/innodb-analyze.result
3352share/mysql/test/suite/innodb/r/innodb-autoinc-18274.result 3376share/mysql/test/suite/innodb/r/innodb-autoinc-18274.result
3353share/mysql/test/suite/innodb/r/innodb-autoinc-44030.result 3377share/mysql/test/suite/innodb/r/innodb-autoinc-44030.result
3354share/mysql/test/suite/innodb/r/innodb-autoinc-56228.result 3378share/mysql/test/suite/innodb/r/innodb-autoinc-56228.result
3355share/mysql/test/suite/innodb/r/innodb-autoinc-optimize.result 3379share/mysql/test/suite/innodb/r/innodb-autoinc-optimize.result
3356share/mysql/test/suite/innodb/r/innodb-autoinc.result 3380share/mysql/test/suite/innodb/r/innodb-autoinc.result
3357share/mysql/test/suite/innodb/r/innodb-blob.result 3381share/mysql/test/suite/innodb/r/innodb-blob.result
3358share/mysql/test/suite/innodb/r/innodb-bug-14068765.result 3382share/mysql/test/suite/innodb/r/innodb-bug-14068765.result
3359share/mysql/test/suite/innodb/r/innodb-bug-14084530.result 3383share/mysql/test/suite/innodb/r/innodb-bug-14084530.result
3360share/mysql/test/suite/innodb/r/innodb-bug12552164.result 3384share/mysql/test/suite/innodb/r/innodb-bug12552164.result
3361share/mysql/test/suite/innodb/r/innodb-bug14219515.result 3385share/mysql/test/suite/innodb/r/innodb-bug14219515.result
3362share/mysql/test/suite/innodb/r/innodb-change-buffer-recovery.result 3386share/mysql/test/suite/innodb/r/innodb-change-buffer-recovery.result
3363share/mysql/test/suite/innodb/r/innodb-consistent.result 3387share/mysql/test/suite/innodb/r/innodb-consistent.result
 3388share/mysql/test/suite/innodb/r/innodb-double-write.result
3364share/mysql/test/suite/innodb/r/innodb-index-debug.result 3389share/mysql/test/suite/innodb/r/innodb-index-debug.result
3365share/mysql/test/suite/innodb/r/innodb-index-online-delete.result 3390share/mysql/test/suite/innodb/r/innodb-index-online-delete.result
3366share/mysql/test/suite/innodb/r/innodb-index-online-fk.result 3391share/mysql/test/suite/innodb/r/innodb-index-online-fk.result
3367share/mysql/test/suite/innodb/r/innodb-index-online-purge.result 3392share/mysql/test/suite/innodb/r/innodb-index-online-purge.result
3368share/mysql/test/suite/innodb/r/innodb-index-online.result 3393share/mysql/test/suite/innodb/r/innodb-index-online.result
3369share/mysql/test/suite/innodb/r/innodb-index.result 3394share/mysql/test/suite/innodb/r/innodb-index.result
3370share/mysql/test/suite/innodb/r/innodb-index_ucs2.result 3395share/mysql/test/suite/innodb/r/innodb-index_ucs2.result
3371share/mysql/test/suite/innodb/r/innodb-lock.result 3396share/mysql/test/suite/innodb/r/innodb-lock.result
3372share/mysql/test/suite/innodb/r/innodb-log-file-size-1.result 3397share/mysql/test/suite/innodb/r/innodb-log-file-size-1.result
3373share/mysql/test/suite/innodb/r/innodb-log-file-size.result 3398share/mysql/test/suite/innodb/r/innodb-log-file-size.result
3374share/mysql/test/suite/innodb/r/innodb-multiple-tablespaces.result 3399share/mysql/test/suite/innodb/r/innodb-multiple-tablespaces.result
3375share/mysql/test/suite/innodb/r/innodb-read-view.result 3400share/mysql/test/suite/innodb/r/innodb-read-view.result
3376share/mysql/test/suite/innodb/r/innodb-replace.result 3401share/mysql/test/suite/innodb/r/innodb-replace.result
3377share/mysql/test/suite/innodb/r/innodb-semi-consistent.result 3402share/mysql/test/suite/innodb/r/innodb-semi-consistent.result
3378share/mysql/test/suite/innodb/r/innodb-status-output.result 3403share/mysql/test/suite/innodb/r/innodb-status-output.result
3379share/mysql/test/suite/innodb/r/innodb-system-table-view.result 3404share/mysql/test/suite/innodb/r/innodb-system-table-view.result
3380share/mysql/test/suite/innodb/r/innodb-table-online.result 3405share/mysql/test/suite/innodb/r/innodb-table-online.result
3381share/mysql/test/suite/innodb/r/innodb-tablespace.result 3406share/mysql/test/suite/innodb/r/innodb-tablespace.result
3382share/mysql/test/suite/innodb/r/innodb-timeout.result 3407share/mysql/test/suite/innodb/r/innodb-timeout.result
3383share/mysql/test/suite/innodb/r/innodb-truncate.result 3408share/mysql/test/suite/innodb/r/innodb-truncate.result
3384share/mysql/test/suite/innodb/r/innodb-ucs2.result 3409share/mysql/test/suite/innodb/r/innodb-ucs2.result
 3410share/mysql/test/suite/innodb/r/innodb-update-insert.result
3385share/mysql/test/suite/innodb/r/innodb-use-sys-malloc.result 3411share/mysql/test/suite/innodb/r/innodb-use-sys-malloc.result
3386share/mysql/test/suite/innodb/r/innodb-wl5522-1.result 3412share/mysql/test/suite/innodb/r/innodb-wl5522-1.result
3387share/mysql/test/suite/innodb/r/innodb-wl5522-debug.result 3413share/mysql/test/suite/innodb/r/innodb-wl5522-debug.result
3388share/mysql/test/suite/innodb/r/innodb-wl5522.result 3414share/mysql/test/suite/innodb/r/innodb-wl5522.result
3389share/mysql/test/suite/innodb/r/innodb-wl5980-alter.result 3415share/mysql/test/suite/innodb/r/innodb-wl5980-alter.result
3390share/mysql/test/suite/innodb/r/innodb-wl5980-debug.result 3416share/mysql/test/suite/innodb/r/innodb-wl5980-debug.result
3391share/mysql/test/suite/innodb/r/innodb-wl5980-discard.result 3417share/mysql/test/suite/innodb/r/innodb-wl5980-discard.result
3392share/mysql/test/suite/innodb/r/innodb-wl5980-linux.result 3418share/mysql/test/suite/innodb/r/innodb-wl5980-linux.result
3393share/mysql/test/suite/innodb/r/innodb-wl5980-windows.result 3419share/mysql/test/suite/innodb/r/innodb-wl5980-windows.result
3394share/mysql/test/suite/innodb/r/innodb-wl6445-1.result 3420share/mysql/test/suite/innodb/r/innodb-wl6445-1.result
3395share/mysql/test/suite/innodb/r/innodb-wl6445-2.result 3421share/mysql/test/suite/innodb/r/innodb-wl6445-2.result
3396share/mysql/test/suite/innodb/r/innodb-wl6445.result 3422share/mysql/test/suite/innodb/r/innodb-wl6445.result
3397share/mysql/test/suite/innodb/r/innodb.result 3423share/mysql/test/suite/innodb/r/innodb.result
@@ -3493,26 +3519,28 @@ share/mysql/test/suite/innodb/r/innodb_s @@ -3493,26 +3519,28 @@ share/mysql/test/suite/innodb/r/innodb_s
3493share/mysql/test/suite/innodb/r/innodb_stats_fetch_corrupted.result 3519share/mysql/test/suite/innodb/r/innodb_stats_fetch_corrupted.result
3494share/mysql/test/suite/innodb/r/innodb_stats_fetch_nonexistent.result 3520share/mysql/test/suite/innodb/r/innodb_stats_fetch_nonexistent.result
3495share/mysql/test/suite/innodb/r/innodb_stats_flag_global_off.result 3521share/mysql/test/suite/innodb/r/innodb_stats_flag_global_off.result
3496share/mysql/test/suite/innodb/r/innodb_stats_flag_global_on.result 3522share/mysql/test/suite/innodb/r/innodb_stats_flag_global_on.result
3497share/mysql/test/suite/innodb/r/innodb_stats_rename_table.result 3523share/mysql/test/suite/innodb/r/innodb_stats_rename_table.result
3498share/mysql/test/suite/innodb/r/innodb_stats_rename_table_if_exists.result 3524share/mysql/test/suite/innodb/r/innodb_stats_rename_table_if_exists.result
3499share/mysql/test/suite/innodb/r/innodb_stats_sample_pages.result 3525share/mysql/test/suite/innodb/r/innodb_stats_sample_pages.result
3500share/mysql/test/suite/innodb/r/innodb_stats_table_flag_auto_recalc.result 3526share/mysql/test/suite/innodb/r/innodb_stats_table_flag_auto_recalc.result
3501share/mysql/test/suite/innodb/r/innodb_stats_table_flag_sample_pages.result 3527share/mysql/test/suite/innodb/r/innodb_stats_table_flag_sample_pages.result
3502share/mysql/test/suite/innodb/r/innodb_timeout_rollback.result 3528share/mysql/test/suite/innodb/r/innodb_timeout_rollback.result
3503share/mysql/test/suite/innodb/r/innodb_trx_weight.result 3529share/mysql/test/suite/innodb/r/innodb_trx_weight.result
3504share/mysql/test/suite/innodb/r/innodb_upd_stats_if_needed_not_inited.result 3530share/mysql/test/suite/innodb/r/innodb_upd_stats_if_needed_not_inited.result
3505share/mysql/test/suite/innodb/r/innodb_ut_format_name.result 3531share/mysql/test/suite/innodb/r/innodb_ut_format_name.result
 3532share/mysql/test/suite/innodb/t/blob-update-debug.test
 3533share/mysql/test/suite/innodb/t/create-index.test
3506share/mysql/test/suite/innodb/t/disabled.def 3534share/mysql/test/suite/innodb/t/disabled.def
3507share/mysql/test/suite/innodb/t/innodb-2byte-collation-master.opt 3535share/mysql/test/suite/innodb/t/innodb-2byte-collation-master.opt
3508share/mysql/test/suite/innodb/t/innodb-2byte-collation.test 3536share/mysql/test/suite/innodb/t/innodb-2byte-collation.test
3509share/mysql/test/suite/innodb/t/innodb-ac-non-locking-select.test 3537share/mysql/test/suite/innodb/t/innodb-ac-non-locking-select.test
3510share/mysql/test/suite/innodb/t/innodb-alter-autoinc.test 3538share/mysql/test/suite/innodb/t/innodb-alter-autoinc.test
3511share/mysql/test/suite/innodb/t/innodb-alter-debug.test 3539share/mysql/test/suite/innodb/t/innodb-alter-debug.test
3512share/mysql/test/suite/innodb/t/innodb-alter-discard.test 3540share/mysql/test/suite/innodb/t/innodb-alter-discard.test
3513share/mysql/test/suite/innodb/t/innodb-alter-nullable.test 3541share/mysql/test/suite/innodb/t/innodb-alter-nullable.test
3514share/mysql/test/suite/innodb/t/innodb-alter.test 3542share/mysql/test/suite/innodb/t/innodb-alter.test
3515share/mysql/test/suite/innodb/t/innodb-analyze.test 3543share/mysql/test/suite/innodb/t/innodb-analyze.test
3516share/mysql/test/suite/innodb/t/innodb-autoinc-18274.test 3544share/mysql/test/suite/innodb/t/innodb-autoinc-18274.test
3517share/mysql/test/suite/innodb/t/innodb-autoinc-44030-master.opt 3545share/mysql/test/suite/innodb/t/innodb-autoinc-44030-master.opt
3518share/mysql/test/suite/innodb/t/innodb-autoinc-44030.test 3546share/mysql/test/suite/innodb/t/innodb-autoinc-44030.test
@@ -3520,51 +3548,53 @@ share/mysql/test/suite/innodb/t/innodb-a @@ -3520,51 +3548,53 @@ share/mysql/test/suite/innodb/t/innodb-a
3520share/mysql/test/suite/innodb/t/innodb-autoinc-56228.test 3548share/mysql/test/suite/innodb/t/innodb-autoinc-56228.test
3521share/mysql/test/suite/innodb/t/innodb-autoinc-master.opt 3549share/mysql/test/suite/innodb/t/innodb-autoinc-master.opt
3522share/mysql/test/suite/innodb/t/innodb-autoinc-optimize.test 3550share/mysql/test/suite/innodb/t/innodb-autoinc-optimize.test
3523share/mysql/test/suite/innodb/t/innodb-autoinc.test 3551share/mysql/test/suite/innodb/t/innodb-autoinc.test
3524share/mysql/test/suite/innodb/t/innodb-blob.test 3552share/mysql/test/suite/innodb/t/innodb-blob.test
3525share/mysql/test/suite/innodb/t/innodb-bug-14068765.test 3553share/mysql/test/suite/innodb/t/innodb-bug-14068765.test
3526share/mysql/test/suite/innodb/t/innodb-bug-14084530.test 3554share/mysql/test/suite/innodb/t/innodb-bug-14084530.test
3527share/mysql/test/suite/innodb/t/innodb-bug12552164.test 3555share/mysql/test/suite/innodb/t/innodb-bug12552164.test
3528share/mysql/test/suite/innodb/t/innodb-bug14219515.test 3556share/mysql/test/suite/innodb/t/innodb-bug14219515.test
3529share/mysql/test/suite/innodb/t/innodb-change-buffer-recovery-master.opt 3557share/mysql/test/suite/innodb/t/innodb-change-buffer-recovery-master.opt
3530share/mysql/test/suite/innodb/t/innodb-change-buffer-recovery.test 3558share/mysql/test/suite/innodb/t/innodb-change-buffer-recovery.test
3531share/mysql/test/suite/innodb/t/innodb-consistent-master.opt 3559share/mysql/test/suite/innodb/t/innodb-consistent-master.opt
3532share/mysql/test/suite/innodb/t/innodb-consistent.test 3560share/mysql/test/suite/innodb/t/innodb-consistent.test
 3561share/mysql/test/suite/innodb/t/innodb-double-write.test
3533share/mysql/test/suite/innodb/t/innodb-index-debug.test 3562share/mysql/test/suite/innodb/t/innodb-index-debug.test
3534share/mysql/test/suite/innodb/t/innodb-index-online-delete.test 3563share/mysql/test/suite/innodb/t/innodb-index-online-delete.test
3535share/mysql/test/suite/innodb/t/innodb-index-online-fk.test 3564share/mysql/test/suite/innodb/t/innodb-index-online-fk.test
3536share/mysql/test/suite/innodb/t/innodb-index-online-master.opt 3565share/mysql/test/suite/innodb/t/innodb-index-online-master.opt
3537share/mysql/test/suite/innodb/t/innodb-index-online-purge.test 3566share/mysql/test/suite/innodb/t/innodb-index-online-purge.test
3538share/mysql/test/suite/innodb/t/innodb-index-online.test 3567share/mysql/test/suite/innodb/t/innodb-index-online.test
3539share/mysql/test/suite/innodb/t/innodb-index.test 3568share/mysql/test/suite/innodb/t/innodb-index.test
3540share/mysql/test/suite/innodb/t/innodb-index_ucs2.test 3569share/mysql/test/suite/innodb/t/innodb-index_ucs2.test
3541share/mysql/test/suite/innodb/t/innodb-lock.test 3570share/mysql/test/suite/innodb/t/innodb-lock.test
3542share/mysql/test/suite/innodb/t/innodb-log-file-size-1.test 3571share/mysql/test/suite/innodb/t/innodb-log-file-size-1.test
3543share/mysql/test/suite/innodb/t/innodb-log-file-size.test 3572share/mysql/test/suite/innodb/t/innodb-log-file-size.test
3544share/mysql/test/suite/innodb/t/innodb-master.opt 3573share/mysql/test/suite/innodb/t/innodb-master.opt
3545share/mysql/test/suite/innodb/t/innodb-multiple-tablespaces.test 3574share/mysql/test/suite/innodb/t/innodb-multiple-tablespaces.test
3546share/mysql/test/suite/innodb/t/innodb-read-view.test 3575share/mysql/test/suite/innodb/t/innodb-read-view.test
3547share/mysql/test/suite/innodb/t/innodb-replace.test 3576share/mysql/test/suite/innodb/t/innodb-replace.test
3548share/mysql/test/suite/innodb/t/innodb-semi-consistent-master.opt 3577share/mysql/test/suite/innodb/t/innodb-semi-consistent-master.opt
3549share/mysql/test/suite/innodb/t/innodb-semi-consistent.test 3578share/mysql/test/suite/innodb/t/innodb-semi-consistent.test
3550share/mysql/test/suite/innodb/t/innodb-status-output.test 3579share/mysql/test/suite/innodb/t/innodb-status-output.test
3551share/mysql/test/suite/innodb/t/innodb-system-table-view.test 3580share/mysql/test/suite/innodb/t/innodb-system-table-view.test
3552share/mysql/test/suite/innodb/t/innodb-table-online-master.opt 3581share/mysql/test/suite/innodb/t/innodb-table-online-master.opt
3553share/mysql/test/suite/innodb/t/innodb-table-online.test 3582share/mysql/test/suite/innodb/t/innodb-table-online.test
3554share/mysql/test/suite/innodb/t/innodb-tablespace.test 3583share/mysql/test/suite/innodb/t/innodb-tablespace.test
3555share/mysql/test/suite/innodb/t/innodb-timeout.test 3584share/mysql/test/suite/innodb/t/innodb-timeout.test
3556share/mysql/test/suite/innodb/t/innodb-truncate.test 3585share/mysql/test/suite/innodb/t/innodb-truncate.test
3557share/mysql/test/suite/innodb/t/innodb-ucs2.test 3586share/mysql/test/suite/innodb/t/innodb-ucs2.test
 3587share/mysql/test/suite/innodb/t/innodb-update-insert.test
3558share/mysql/test/suite/innodb/t/innodb-use-sys-malloc-master.opt 3588share/mysql/test/suite/innodb/t/innodb-use-sys-malloc-master.opt
3559share/mysql/test/suite/innodb/t/innodb-use-sys-malloc.test 3589share/mysql/test/suite/innodb/t/innodb-use-sys-malloc.test
3560share/mysql/test/suite/innodb/t/innodb-wl5522-1.test 3590share/mysql/test/suite/innodb/t/innodb-wl5522-1.test
3561share/mysql/test/suite/innodb/t/innodb-wl5522-debug.test 3591share/mysql/test/suite/innodb/t/innodb-wl5522-debug.test
3562share/mysql/test/suite/innodb/t/innodb-wl5522.test 3592share/mysql/test/suite/innodb/t/innodb-wl5522.test
3563share/mysql/test/suite/innodb/t/innodb-wl5980-alter.test 3593share/mysql/test/suite/innodb/t/innodb-wl5980-alter.test
3564share/mysql/test/suite/innodb/t/innodb-wl5980-debug.test 3594share/mysql/test/suite/innodb/t/innodb-wl5980-debug.test
3565share/mysql/test/suite/innodb/t/innodb-wl5980-discard.test 3595share/mysql/test/suite/innodb/t/innodb-wl5980-discard.test
3566share/mysql/test/suite/innodb/t/innodb-wl5980-linux.test 3596share/mysql/test/suite/innodb/t/innodb-wl5980-linux.test
3567share/mysql/test/suite/innodb/t/innodb-wl5980-windows.test 3597share/mysql/test/suite/innodb/t/innodb-wl5980-windows.test
3568share/mysql/test/suite/innodb/t/innodb-wl6445-1.test 3598share/mysql/test/suite/innodb/t/innodb-wl6445-1.test
3569share/mysql/test/suite/innodb/t/innodb-wl6445-2.test 3599share/mysql/test/suite/innodb/t/innodb-wl6445-2.test
3570share/mysql/test/suite/innodb/t/innodb-wl6445.test 3600share/mysql/test/suite/innodb/t/innodb-wl6445.test
@@ -6026,46 +6056,58 @@ share/mysql/test/suite/rpl/r/rpl_drop_te @@ -6026,46 +6056,58 @@ share/mysql/test/suite/rpl/r/rpl_drop_te
6026share/mysql/test/suite/rpl/r/rpl_drop_view.result 6056share/mysql/test/suite/rpl/r/rpl_drop_view.result
6027share/mysql/test/suite/rpl/r/rpl_dual_pos_advance.result 6057share/mysql/test/suite/rpl/r/rpl_dual_pos_advance.result
6028share/mysql/test/suite/rpl/r/rpl_empty_master_host.result 6058share/mysql/test/suite/rpl/r/rpl_empty_master_host.result
6029share/mysql/test/suite/rpl/r/rpl_err_ignoredtable.result 6059share/mysql/test/suite/rpl/r/rpl_err_ignoredtable.result
6030share/mysql/test/suite/rpl/r/rpl_events.result 6060share/mysql/test/suite/rpl/r/rpl_events.result
6031share/mysql/test/suite/rpl/r/rpl_extra_col_master_innodb.result 6061share/mysql/test/suite/rpl/r/rpl_extra_col_master_innodb.result
6032share/mysql/test/suite/rpl/r/rpl_extra_col_master_myisam.result 6062share/mysql/test/suite/rpl/r/rpl_extra_col_master_myisam.result
6033share/mysql/test/suite/rpl/r/rpl_extra_col_slave_innodb.result 6063share/mysql/test/suite/rpl/r/rpl_extra_col_slave_innodb.result
6034share/mysql/test/suite/rpl/r/rpl_extra_col_slave_myisam.result 6064share/mysql/test/suite/rpl/r/rpl_extra_col_slave_myisam.result
6035share/mysql/test/suite/rpl/r/rpl_extra_row_data.result 6065share/mysql/test/suite/rpl/r/rpl_extra_row_data.result
6036share/mysql/test/suite/rpl/r/rpl_failed_optimize.result 6066share/mysql/test/suite/rpl/r/rpl_failed_optimize.result
6037share/mysql/test/suite/rpl/r/rpl_filter_database.result 6067share/mysql/test/suite/rpl/r/rpl_filter_database.result
6038share/mysql/test/suite/rpl/r/rpl_filter_tables_not_exist.result 6068share/mysql/test/suite/rpl/r/rpl_filter_tables_not_exist.result
 6069share/mysql/test/suite/rpl/r/rpl_filter_warnings.result
6039share/mysql/test/suite/rpl/r/rpl_flush_logs.result 6070share/mysql/test/suite/rpl/r/rpl_flush_logs.result
6040share/mysql/test/suite/rpl/r/rpl_flushlog_loop.result 6071share/mysql/test/suite/rpl/r/rpl_flushlog_loop.result
6041share/mysql/test/suite/rpl/r/rpl_foreign_key_innodb.result 6072share/mysql/test/suite/rpl/r/rpl_foreign_key_innodb.result
6042share/mysql/test/suite/rpl/r/rpl_free_items.result 6073share/mysql/test/suite/rpl/r/rpl_free_items.result
6043share/mysql/test/suite/rpl/r/rpl_function_defaults.result 6074share/mysql/test/suite/rpl/r/rpl_function_defaults.result
6044share/mysql/test/suite/rpl/r/rpl_general_log.result 6075share/mysql/test/suite/rpl/r/rpl_general_log.result
6045share/mysql/test/suite/rpl/r/rpl_geometry.result 6076share/mysql/test/suite/rpl/r/rpl_geometry.result
6046share/mysql/test/suite/rpl/r/rpl_get_lock.result 6077share/mysql/test/suite/rpl/r/rpl_get_lock.result
6047share/mysql/test/suite/rpl/r/rpl_get_master_version_and_clock.result 6078share/mysql/test/suite/rpl/r/rpl_get_master_version_and_clock.result
6048share/mysql/test/suite/rpl/r/rpl_grant.result 6079share/mysql/test/suite/rpl/r/rpl_grant.result
6049share/mysql/test/suite/rpl/r/rpl_grant_plugin.result 6080share/mysql/test/suite/rpl/r/rpl_grant_plugin.result
6050share/mysql/test/suite/rpl/r/rpl_group_commit_deadlock.result 6081share/mysql/test/suite/rpl/r/rpl_group_commit_deadlock.result
 6082share/mysql/test/suite/rpl/r/rpl_gtid_binlog_errors.result
 6083share/mysql/test/suite/rpl/r/rpl_gtid_do_table_filter_insensitive.result
 6084share/mysql/test/suite/rpl/r/rpl_gtid_do_table_filter_sensitive.result
6051share/mysql/test/suite/rpl/r/rpl_gtid_empty_group.result 6085share/mysql/test/suite/rpl/r/rpl_gtid_empty_group.result
6052share/mysql/test/suite/rpl/r/rpl_gtid_execution.result 6086share/mysql/test/suite/rpl/r/rpl_gtid_execution.result
6053share/mysql/test/suite/rpl/r/rpl_gtid_failover.result 6087share/mysql/test/suite/rpl/r/rpl_gtid_failover.result
 6088share/mysql/test/suite/rpl/r/rpl_gtid_heartbeat_2slave.result
 6089share/mysql/test/suite/rpl/r/rpl_gtid_ignore_table_filter_insensitive.result
 6090share/mysql/test/suite/rpl/r/rpl_gtid_ignore_table_filter_sensitive.result
 6091share/mysql/test/suite/rpl/r/rpl_gtid_loaddata_s.result
6054share/mysql/test/suite/rpl/r/rpl_gtid_mode.result 6092share/mysql/test/suite/rpl/r/rpl_gtid_mode.result
6055share/mysql/test/suite/rpl/r/rpl_gtid_parallel.result 6093share/mysql/test/suite/rpl/r/rpl_gtid_parallel.result
6056share/mysql/test/suite/rpl/r/rpl_gtid_purged_fail_to_connect.result 6094share/mysql/test/suite/rpl/r/rpl_gtid_purged_fail_to_connect.result
6057share/mysql/test/suite/rpl/r/rpl_gtid_purged_maintained.result 6095share/mysql/test/suite/rpl/r/rpl_gtid_purged_maintained.result
 6096share/mysql/test/suite/rpl/r/rpl_gtid_row_event_max_size.result
 6097share/mysql/test/suite/rpl/r/rpl_gtid_row_show_relaylog_events.result
6058share/mysql/test/suite/rpl/r/rpl_gtid_sql_until_before_after.result 6098share/mysql/test/suite/rpl/r/rpl_gtid_sql_until_before_after.result
 6099share/mysql/test/suite/rpl/r/rpl_gtid_stm_insert_delayed.result
 6100share/mysql/test/suite/rpl/r/rpl_gtid_stm_mix_show_relaylog_events.result
6059share/mysql/test/suite/rpl/r/rpl_gtid_stress_failover.result 6101share/mysql/test/suite/rpl/r/rpl_gtid_stress_failover.result
6060share/mysql/test/suite/rpl/r/rpl_heartbeat.result 6102share/mysql/test/suite/rpl/r/rpl_heartbeat.result
6061share/mysql/test/suite/rpl/r/rpl_heartbeat_2slaves.result 6103share/mysql/test/suite/rpl/r/rpl_heartbeat_2slaves.result
6062share/mysql/test/suite/rpl/r/rpl_heartbeat_basic.result 6104share/mysql/test/suite/rpl/r/rpl_heartbeat_basic.result
6063share/mysql/test/suite/rpl/r/rpl_heartbeat_ssl.result 6105share/mysql/test/suite/rpl/r/rpl_heartbeat_ssl.result
6064share/mysql/test/suite/rpl/r/rpl_idempotency.result 6106share/mysql/test/suite/rpl/r/rpl_idempotency.result
6065share/mysql/test/suite/rpl/r/rpl_ignore_db_filter.result 6107share/mysql/test/suite/rpl/r/rpl_ignore_db_filter.result
6066share/mysql/test/suite/rpl/r/rpl_ignore_grant.result 6108share/mysql/test/suite/rpl/r/rpl_ignore_grant.result
6067share/mysql/test/suite/rpl/r/rpl_ignore_revoke.result 6109share/mysql/test/suite/rpl/r/rpl_ignore_revoke.result
6068share/mysql/test/suite/rpl/r/rpl_ignore_table.result 6110share/mysql/test/suite/rpl/r/rpl_ignore_table.result
6069share/mysql/test/suite/rpl/r/rpl_ignore_table_filter_insensitive.result 6111share/mysql/test/suite/rpl/r/rpl_ignore_table_filter_insensitive.result
6070share/mysql/test/suite/rpl/r/rpl_ignore_table_filter_sensitive.result 6112share/mysql/test/suite/rpl/r/rpl_ignore_table_filter_sensitive.result
6071share/mysql/test/suite/rpl/r/rpl_ignore_table_update.result 6113share/mysql/test/suite/rpl/r/rpl_ignore_table_update.result
@@ -6153,26 +6195,27 @@ share/mysql/test/suite/rpl/r/rpl_partiti @@ -6153,26 +6195,27 @@ share/mysql/test/suite/rpl/r/rpl_partiti
6153share/mysql/test/suite/rpl/r/rpl_partition_innodb.result 6195share/mysql/test/suite/rpl/r/rpl_partition_innodb.result
6154share/mysql/test/suite/rpl/r/rpl_partition_memory.result 6196share/mysql/test/suite/rpl/r/rpl_partition_memory.result
6155share/mysql/test/suite/rpl/r/rpl_partition_myisam.result 6197share/mysql/test/suite/rpl/r/rpl_partition_myisam.result
6156share/mysql/test/suite/rpl/r/rpl_plugin_load.result 6198share/mysql/test/suite/rpl/r/rpl_plugin_load.result
6157share/mysql/test/suite/rpl/r/rpl_ps.result 6199share/mysql/test/suite/rpl/r/rpl_ps.result
6158share/mysql/test/suite/rpl/r/rpl_rbr_to_sbr.result 6200share/mysql/test/suite/rpl/r/rpl_rbr_to_sbr.result
6159share/mysql/test/suite/rpl/r/rpl_read_old_relay_log_info.result 6201share/mysql/test/suite/rpl/r/rpl_read_old_relay_log_info.result
6160share/mysql/test/suite/rpl/r/rpl_read_only.result 6202share/mysql/test/suite/rpl/r/rpl_read_only.result
6161share/mysql/test/suite/rpl/r/rpl_relay_space_innodb.result 6203share/mysql/test/suite/rpl/r/rpl_relay_space_innodb.result
6162share/mysql/test/suite/rpl/r/rpl_relay_space_myisam.result 6204share/mysql/test/suite/rpl/r/rpl_relay_space_myisam.result
6163share/mysql/test/suite/rpl/r/rpl_relayrotate.result 6205share/mysql/test/suite/rpl/r/rpl_relayrotate.result
6164share/mysql/test/suite/rpl/r/rpl_relayspace.result 6206share/mysql/test/suite/rpl/r/rpl_relayspace.result
6165share/mysql/test/suite/rpl/r/rpl_replicate_do.result 6207share/mysql/test/suite/rpl/r/rpl_replicate_do.result
 6208share/mysql/test/suite/rpl/r/rpl_replicate_event_after_sync_stage.result
6166share/mysql/test/suite/rpl/r/rpl_replicate_ignore_db.result 6209share/mysql/test/suite/rpl/r/rpl_replicate_ignore_db.result
6167share/mysql/test/suite/rpl/r/rpl_replicate_rewrite_db.result 6210share/mysql/test/suite/rpl/r/rpl_replicate_rewrite_db.result
6168share/mysql/test/suite/rpl/r/rpl_report.result 6211share/mysql/test/suite/rpl/r/rpl_report.result
6169share/mysql/test/suite/rpl/r/rpl_report_port.result 6212share/mysql/test/suite/rpl/r/rpl_report_port.result
6170share/mysql/test/suite/rpl/r/rpl_rewrite_db_filter.result 6213share/mysql/test/suite/rpl/r/rpl_rewrite_db_filter.result
6171share/mysql/test/suite/rpl/r/rpl_rewrt_db.result 6214share/mysql/test/suite/rpl/r/rpl_rewrt_db.result
6172share/mysql/test/suite/rpl/r/rpl_rotate_logs.result 6215share/mysql/test/suite/rpl/r/rpl_rotate_logs.result
6173share/mysql/test/suite/rpl/r/rpl_rotate_purge_deadlock.result 6216share/mysql/test/suite/rpl/r/rpl_rotate_purge_deadlock.result
6174share/mysql/test/suite/rpl/r/rpl_row_001.result 6217share/mysql/test/suite/rpl/r/rpl_row_001.result
6175share/mysql/test/suite/rpl/r/rpl_row_4_bytes.result 6218share/mysql/test/suite/rpl/r/rpl_row_4_bytes.result
6176share/mysql/test/suite/rpl/r/rpl_row_NOW.result 6219share/mysql/test/suite/rpl/r/rpl_row_NOW.result
6177share/mysql/test/suite/rpl/r/rpl_row_USER.result 6220share/mysql/test/suite/rpl/r/rpl_row_USER.result
6178share/mysql/test/suite/rpl/r/rpl_row_UUID.result 6221share/mysql/test/suite/rpl/r/rpl_row_UUID.result
@@ -6271,26 +6314,27 @@ share/mysql/test/suite/rpl/r/rpl_server_ @@ -6271,26 +6314,27 @@ share/mysql/test/suite/rpl/r/rpl_server_
6271share/mysql/test/suite/rpl/r/rpl_server_id_ignore.result 6314share/mysql/test/suite/rpl/r/rpl_server_id_ignore.result
6272share/mysql/test/suite/rpl/r/rpl_server_uuid.result 6315share/mysql/test/suite/rpl/r/rpl_server_uuid.result
6273share/mysql/test/suite/rpl/r/rpl_session_var.result 6316share/mysql/test/suite/rpl/r/rpl_session_var.result
6274share/mysql/test/suite/rpl/r/rpl_set_charset.result 6317share/mysql/test/suite/rpl/r/rpl_set_charset.result
6275share/mysql/test/suite/rpl/r/rpl_set_null_innodb.result 6318share/mysql/test/suite/rpl/r/rpl_set_null_innodb.result
6276share/mysql/test/suite/rpl/r/rpl_set_null_myisam.result 6319share/mysql/test/suite/rpl/r/rpl_set_null_myisam.result
6277share/mysql/test/suite/rpl/r/rpl_show_errors.result 6320share/mysql/test/suite/rpl/r/rpl_show_errors.result
6278share/mysql/test/suite/rpl/r/rpl_show_master_info_file.result 6321share/mysql/test/suite/rpl/r/rpl_show_master_info_file.result
6279share/mysql/test/suite/rpl/r/rpl_show_slave_hosts.result 6322share/mysql/test/suite/rpl/r/rpl_show_slave_hosts.result
6280share/mysql/test/suite/rpl/r/rpl_show_slave_running.result 6323share/mysql/test/suite/rpl/r/rpl_show_slave_running.result
6281share/mysql/test/suite/rpl/r/rpl_skip_ddl_errors_cli.result 6324share/mysql/test/suite/rpl/r/rpl_skip_ddl_errors_cli.result
6282share/mysql/test/suite/rpl/r/rpl_skip_error.result 6325share/mysql/test/suite/rpl/r/rpl_skip_error.result
6283share/mysql/test/suite/rpl/r/rpl_skip_incident.result 6326share/mysql/test/suite/rpl/r/rpl_skip_incident.result
 6327share/mysql/test/suite/rpl/r/rpl_skip_slave_err_warnings.result
6284share/mysql/test/suite/rpl/r/rpl_slave_grp_exec.result 6328share/mysql/test/suite/rpl/r/rpl_slave_grp_exec.result
6285share/mysql/test/suite/rpl/r/rpl_slave_load_in.result 6329share/mysql/test/suite/rpl/r/rpl_slave_load_in.result
6286share/mysql/test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result 6330share/mysql/test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
6287share/mysql/test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result 6331share/mysql/test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result
6288share/mysql/test/suite/rpl/r/rpl_slave_skip.result 6332share/mysql/test/suite/rpl/r/rpl_slave_skip.result
6289share/mysql/test/suite/rpl/r/rpl_slave_start.result 6333share/mysql/test/suite/rpl/r/rpl_slave_start.result
6290share/mysql/test/suite/rpl/r/rpl_slave_status.result 6334share/mysql/test/suite/rpl/r/rpl_slave_status.result
6291share/mysql/test/suite/rpl/r/rpl_slow_query_log.result 6335share/mysql/test/suite/rpl/r/rpl_slow_query_log.result
6292share/mysql/test/suite/rpl/r/rpl_sp.result 6336share/mysql/test/suite/rpl/r/rpl_sp.result
6293share/mysql/test/suite/rpl/r/rpl_sp004.result 6337share/mysql/test/suite/rpl/r/rpl_sp004.result
6294share/mysql/test/suite/rpl/r/rpl_sp_effects.result 6338share/mysql/test/suite/rpl/r/rpl_sp_effects.result
6295share/mysql/test/suite/rpl/r/rpl_spec_variables.result 6339share/mysql/test/suite/rpl/r/rpl_spec_variables.result
6296share/mysql/test/suite/rpl/r/rpl_sporadic_master.result 6340share/mysql/test/suite/rpl/r/rpl_sporadic_master.result
@@ -6456,62 +6500,86 @@ share/mysql/test/suite/rpl/t/rpl_err_ign @@ -6456,62 +6500,86 @@ share/mysql/test/suite/rpl/t/rpl_err_ign
6456share/mysql/test/suite/rpl/t/rpl_events.test 6500share/mysql/test/suite/rpl/t/rpl_events.test
6457share/mysql/test/suite/rpl/t/rpl_extra_col_master_innodb.test 6501share/mysql/test/suite/rpl/t/rpl_extra_col_master_innodb.test
6458share/mysql/test/suite/rpl/t/rpl_extra_col_master_myisam.test 6502share/mysql/test/suite/rpl/t/rpl_extra_col_master_myisam.test
6459share/mysql/test/suite/rpl/t/rpl_extra_col_slave_innodb.test 6503share/mysql/test/suite/rpl/t/rpl_extra_col_slave_innodb.test
6460share/mysql/test/suite/rpl/t/rpl_extra_col_slave_myisam.test 6504share/mysql/test/suite/rpl/t/rpl_extra_col_slave_myisam.test
6461share/mysql/test/suite/rpl/t/rpl_extra_row_data-master.opt 6505share/mysql/test/suite/rpl/t/rpl_extra_row_data-master.opt
6462share/mysql/test/suite/rpl/t/rpl_extra_row_data-slave.opt 6506share/mysql/test/suite/rpl/t/rpl_extra_row_data-slave.opt
6463share/mysql/test/suite/rpl/t/rpl_extra_row_data.test 6507share/mysql/test/suite/rpl/t/rpl_extra_row_data.test
6464share/mysql/test/suite/rpl/t/rpl_failed_optimize.test 6508share/mysql/test/suite/rpl/t/rpl_failed_optimize.test
6465share/mysql/test/suite/rpl/t/rpl_filter_database-slave.opt 6509share/mysql/test/suite/rpl/t/rpl_filter_database-slave.opt
6466share/mysql/test/suite/rpl/t/rpl_filter_database.test 6510share/mysql/test/suite/rpl/t/rpl_filter_database.test
6467share/mysql/test/suite/rpl/t/rpl_filter_tables_not_exist-slave.opt 6511share/mysql/test/suite/rpl/t/rpl_filter_tables_not_exist-slave.opt
6468share/mysql/test/suite/rpl/t/rpl_filter_tables_not_exist.test 6512share/mysql/test/suite/rpl/t/rpl_filter_tables_not_exist.test
 6513share/mysql/test/suite/rpl/t/rpl_filter_warnings-slave.opt
 6514share/mysql/test/suite/rpl/t/rpl_filter_warnings.test
6469share/mysql/test/suite/rpl/t/rpl_flush_logs-master.opt 6515share/mysql/test/suite/rpl/t/rpl_flush_logs-master.opt
6470share/mysql/test/suite/rpl/t/rpl_flush_logs.test 6516share/mysql/test/suite/rpl/t/rpl_flush_logs.test
6471share/mysql/test/suite/rpl/t/rpl_flushlog_loop-master.opt 6517share/mysql/test/suite/rpl/t/rpl_flushlog_loop-master.opt
6472share/mysql/test/suite/rpl/t/rpl_flushlog_loop-slave.opt 6518share/mysql/test/suite/rpl/t/rpl_flushlog_loop-slave.opt
6473share/mysql/test/suite/rpl/t/rpl_flushlog_loop.test 6519share/mysql/test/suite/rpl/t/rpl_flushlog_loop.test
6474share/mysql/test/suite/rpl/t/rpl_foreign_key_innodb.test 6520share/mysql/test/suite/rpl/t/rpl_foreign_key_innodb.test
6475share/mysql/test/suite/rpl/t/rpl_free_items-slave.opt 6521share/mysql/test/suite/rpl/t/rpl_free_items-slave.opt
6476share/mysql/test/suite/rpl/t/rpl_free_items.test 6522share/mysql/test/suite/rpl/t/rpl_free_items.test
6477share/mysql/test/suite/rpl/t/rpl_function_defaults.test 6523share/mysql/test/suite/rpl/t/rpl_function_defaults.test
6478share/mysql/test/suite/rpl/t/rpl_general_log.test 6524share/mysql/test/suite/rpl/t/rpl_general_log.test
6479share/mysql/test/suite/rpl/t/rpl_geometry.test 6525share/mysql/test/suite/rpl/t/rpl_geometry.test
6480share/mysql/test/suite/rpl/t/rpl_get_lock.test 6526share/mysql/test/suite/rpl/t/rpl_get_lock.test
6481share/mysql/test/suite/rpl/t/rpl_get_master_version_and_clock-slave.opt 6527share/mysql/test/suite/rpl/t/rpl_get_master_version_and_clock-slave.opt
6482share/mysql/test/suite/rpl/t/rpl_get_master_version_and_clock.test 6528share/mysql/test/suite/rpl/t/rpl_get_master_version_and_clock.test
6483share/mysql/test/suite/rpl/t/rpl_grant.test 6529share/mysql/test/suite/rpl/t/rpl_grant.test
6484share/mysql/test/suite/rpl/t/rpl_grant_plugin-master.opt 6530share/mysql/test/suite/rpl/t/rpl_grant_plugin-master.opt
6485share/mysql/test/suite/rpl/t/rpl_grant_plugin-slave.opt 6531share/mysql/test/suite/rpl/t/rpl_grant_plugin-slave.opt
6486share/mysql/test/suite/rpl/t/rpl_grant_plugin.test 6532share/mysql/test/suite/rpl/t/rpl_grant_plugin.test
6487share/mysql/test/suite/rpl/t/rpl_group_commit_deadlock.test 6533share/mysql/test/suite/rpl/t/rpl_group_commit_deadlock.test
 6534share/mysql/test/suite/rpl/t/rpl_gtid_binlog_errors-master.opt
 6535share/mysql/test/suite/rpl/t/rpl_gtid_binlog_errors.test
 6536share/mysql/test/suite/rpl/t/rpl_gtid_do_table_filter_insensitive-master.opt
 6537share/mysql/test/suite/rpl/t/rpl_gtid_do_table_filter_insensitive-slave.opt
 6538share/mysql/test/suite/rpl/t/rpl_gtid_do_table_filter_insensitive.test
 6539share/mysql/test/suite/rpl/t/rpl_gtid_do_table_filter_sensitive-master.opt
 6540share/mysql/test/suite/rpl/t/rpl_gtid_do_table_filter_sensitive-slave.opt
 6541share/mysql/test/suite/rpl/t/rpl_gtid_do_table_filter_sensitive.test
6488share/mysql/test/suite/rpl/t/rpl_gtid_empty_group-master.opt 6542share/mysql/test/suite/rpl/t/rpl_gtid_empty_group-master.opt
6489share/mysql/test/suite/rpl/t/rpl_gtid_empty_group-slave.opt 6543share/mysql/test/suite/rpl/t/rpl_gtid_empty_group-slave.opt
6490share/mysql/test/suite/rpl/t/rpl_gtid_empty_group.test 6544share/mysql/test/suite/rpl/t/rpl_gtid_empty_group.test
6491share/mysql/test/suite/rpl/t/rpl_gtid_execution-master.opt 6545share/mysql/test/suite/rpl/t/rpl_gtid_execution-master.opt
6492share/mysql/test/suite/rpl/t/rpl_gtid_execution-slave.opt 6546share/mysql/test/suite/rpl/t/rpl_gtid_execution-slave.opt
6493share/mysql/test/suite/rpl/t/rpl_gtid_execution.test 6547share/mysql/test/suite/rpl/t/rpl_gtid_execution.test
6494share/mysql/test/suite/rpl/t/rpl_gtid_failover.cnf 6548share/mysql/test/suite/rpl/t/rpl_gtid_failover.cnf
6495share/mysql/test/suite/rpl/t/rpl_gtid_failover.test 6549share/mysql/test/suite/rpl/t/rpl_gtid_failover.test
 6550share/mysql/test/suite/rpl/t/rpl_gtid_heartbeat_2slave.cnf
 6551share/mysql/test/suite/rpl/t/rpl_gtid_heartbeat_2slave.test
 6552share/mysql/test/suite/rpl/t/rpl_gtid_ignore_table_filter_insensitive-master.opt
 6553share/mysql/test/suite/rpl/t/rpl_gtid_ignore_table_filter_insensitive-slave.opt
 6554share/mysql/test/suite/rpl/t/rpl_gtid_ignore_table_filter_insensitive.test
 6555share/mysql/test/suite/rpl/t/rpl_gtid_ignore_table_filter_sensitive-master.opt
 6556share/mysql/test/suite/rpl/t/rpl_gtid_ignore_table_filter_sensitive-slave.opt
 6557share/mysql/test/suite/rpl/t/rpl_gtid_ignore_table_filter_sensitive.test
 6558share/mysql/test/suite/rpl/t/rpl_gtid_loaddata_s-slave.opt
 6559share/mysql/test/suite/rpl/t/rpl_gtid_loaddata_s.test
6496share/mysql/test/suite/rpl/t/rpl_gtid_mode.test 6560share/mysql/test/suite/rpl/t/rpl_gtid_mode.test
6497share/mysql/test/suite/rpl/t/rpl_gtid_parallel-master.opt 
6498share/mysql/test/suite/rpl/t/rpl_gtid_parallel-slave.opt 
6499share/mysql/test/suite/rpl/t/rpl_gtid_parallel.test 6561share/mysql/test/suite/rpl/t/rpl_gtid_parallel.test
6500share/mysql/test/suite/rpl/t/rpl_gtid_purged_fail_to_connect-master.opt 6562share/mysql/test/suite/rpl/t/rpl_gtid_purged_fail_to_connect-master.opt
6501share/mysql/test/suite/rpl/t/rpl_gtid_purged_fail_to_connect-slave.opt 6563share/mysql/test/suite/rpl/t/rpl_gtid_purged_fail_to_connect-slave.opt
6502share/mysql/test/suite/rpl/t/rpl_gtid_purged_fail_to_connect.test 6564share/mysql/test/suite/rpl/t/rpl_gtid_purged_fail_to_connect.test
6503share/mysql/test/suite/rpl/t/rpl_gtid_purged_maintained.test 6565share/mysql/test/suite/rpl/t/rpl_gtid_purged_maintained.test
 6566share/mysql/test/suite/rpl/t/rpl_gtid_row_event_max_size-master.opt
 6567share/mysql/test/suite/rpl/t/rpl_gtid_row_event_max_size-slave.opt
 6568share/mysql/test/suite/rpl/t/rpl_gtid_row_event_max_size.test
 6569share/mysql/test/suite/rpl/t/rpl_gtid_row_show_relaylog_events.test
6504share/mysql/test/suite/rpl/t/rpl_gtid_sql_until_before_after.test 6570share/mysql/test/suite/rpl/t/rpl_gtid_sql_until_before_after.test
 6571share/mysql/test/suite/rpl/t/rpl_gtid_stm_insert_delayed.test
 6572share/mysql/test/suite/rpl/t/rpl_gtid_stm_mix_show_relaylog_events.test
6505share/mysql/test/suite/rpl/t/rpl_gtid_stress_failover.cnf 6573share/mysql/test/suite/rpl/t/rpl_gtid_stress_failover.cnf
6506share/mysql/test/suite/rpl/t/rpl_gtid_stress_failover.test 6574share/mysql/test/suite/rpl/t/rpl_gtid_stress_failover.test
6507share/mysql/test/suite/rpl/t/rpl_heartbeat-master.opt 6575share/mysql/test/suite/rpl/t/rpl_heartbeat-master.opt
6508share/mysql/test/suite/rpl/t/rpl_heartbeat.test 6576share/mysql/test/suite/rpl/t/rpl_heartbeat.test
6509share/mysql/test/suite/rpl/t/rpl_heartbeat_2slaves.cnf 6577share/mysql/test/suite/rpl/t/rpl_heartbeat_2slaves.cnf
6510share/mysql/test/suite/rpl/t/rpl_heartbeat_2slaves.test 6578share/mysql/test/suite/rpl/t/rpl_heartbeat_2slaves.test
6511share/mysql/test/suite/rpl/t/rpl_heartbeat_basic.cnf 6579share/mysql/test/suite/rpl/t/rpl_heartbeat_basic.cnf
6512share/mysql/test/suite/rpl/t/rpl_heartbeat_basic.test 6580share/mysql/test/suite/rpl/t/rpl_heartbeat_basic.test
6513share/mysql/test/suite/rpl/t/rpl_heartbeat_ssl.test 6581share/mysql/test/suite/rpl/t/rpl_heartbeat_ssl.test
6514share/mysql/test/suite/rpl/t/rpl_idempotency.test 6582share/mysql/test/suite/rpl/t/rpl_idempotency.test
6515share/mysql/test/suite/rpl/t/rpl_ignore_db_filter-master.opt 6583share/mysql/test/suite/rpl/t/rpl_ignore_db_filter-master.opt
6516share/mysql/test/suite/rpl/t/rpl_ignore_db_filter-slave.opt 6584share/mysql/test/suite/rpl/t/rpl_ignore_db_filter-slave.opt
6517share/mysql/test/suite/rpl/t/rpl_ignore_db_filter.test 6585share/mysql/test/suite/rpl/t/rpl_ignore_db_filter.test
@@ -6612,28 +6680,26 @@ share/mysql/test/suite/rpl/t/rpl_mts_deb @@ -6612,28 +6680,26 @@ share/mysql/test/suite/rpl/t/rpl_mts_deb
6612share/mysql/test/suite/rpl/t/rpl_mts_debug.test 6680share/mysql/test/suite/rpl/t/rpl_mts_debug.test
6613share/mysql/test/suite/rpl/t/rpl_multi_delete-slave.opt 6681share/mysql/test/suite/rpl/t/rpl_multi_delete-slave.opt
6614share/mysql/test/suite/rpl/t/rpl_multi_delete.test 6682share/mysql/test/suite/rpl/t/rpl_multi_delete.test
6615share/mysql/test/suite/rpl/t/rpl_multi_delete2-slave.opt 6683share/mysql/test/suite/rpl/t/rpl_multi_delete2-slave.opt
6616share/mysql/test/suite/rpl/t/rpl_multi_delete2.test 6684share/mysql/test/suite/rpl/t/rpl_multi_delete2.test
6617share/mysql/test/suite/rpl/t/rpl_multi_engine.test 6685share/mysql/test/suite/rpl/t/rpl_multi_engine.test
6618share/mysql/test/suite/rpl/t/rpl_multi_update.test 6686share/mysql/test/suite/rpl/t/rpl_multi_update.test
6619share/mysql/test/suite/rpl/t/rpl_multi_update2-slave.opt 6687share/mysql/test/suite/rpl/t/rpl_multi_update2-slave.opt
6620share/mysql/test/suite/rpl/t/rpl_multi_update2.test 6688share/mysql/test/suite/rpl/t/rpl_multi_update2.test
6621share/mysql/test/suite/rpl/t/rpl_multi_update3.test 6689share/mysql/test/suite/rpl/t/rpl_multi_update3.test
6622share/mysql/test/suite/rpl/t/rpl_multi_update4-slave.opt 6690share/mysql/test/suite/rpl/t/rpl_multi_update4-slave.opt
6623share/mysql/test/suite/rpl/t/rpl_multi_update4.test 6691share/mysql/test/suite/rpl/t/rpl_multi_update4.test
6624share/mysql/test/suite/rpl/t/rpl_mysql_upgrade.test 6692share/mysql/test/suite/rpl/t/rpl_mysql_upgrade.test
6625share/mysql/test/suite/rpl/t/rpl_mysqlbinlog_gtid_on-master.opt 
6626share/mysql/test/suite/rpl/t/rpl_mysqlbinlog_gtid_on-slave.opt 
6627share/mysql/test/suite/rpl/t/rpl_mysqlbinlog_gtid_on.test 6693share/mysql/test/suite/rpl/t/rpl_mysqlbinlog_gtid_on.test
6628share/mysql/test/suite/rpl/t/rpl_name_const.test 6694share/mysql/test/suite/rpl/t/rpl_name_const.test
6629share/mysql/test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test 6695share/mysql/test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test
6630share/mysql/test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test 6696share/mysql/test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test
6631share/mysql/test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test 6697share/mysql/test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test
6632share/mysql/test/suite/rpl/t/rpl_nondeterministic_functions.test 6698share/mysql/test/suite/rpl/t/rpl_nondeterministic_functions.test
6633share/mysql/test/suite/rpl/t/rpl_not_null_innodb.test 6699share/mysql/test/suite/rpl/t/rpl_not_null_innodb.test
6634share/mysql/test/suite/rpl/t/rpl_not_null_myisam.test 6700share/mysql/test/suite/rpl/t/rpl_not_null_myisam.test
6635share/mysql/test/suite/rpl/t/rpl_optimize.test 6701share/mysql/test/suite/rpl/t/rpl_optimize.test
6636share/mysql/test/suite/rpl/t/rpl_packet-master.opt 6702share/mysql/test/suite/rpl/t/rpl_packet-master.opt
6637share/mysql/test/suite/rpl/t/rpl_packet-slave.opt 6703share/mysql/test/suite/rpl/t/rpl_packet-slave.opt
6638share/mysql/test/suite/rpl/t/rpl_packet.test 6704share/mysql/test/suite/rpl/t/rpl_packet.test
6639share/mysql/test/suite/rpl/t/rpl_parallel-master.opt 6705share/mysql/test/suite/rpl/t/rpl_parallel-master.opt
@@ -6674,26 +6740,27 @@ share/mysql/test/suite/rpl/t/rpl_plugin_ @@ -6674,26 +6740,27 @@ share/mysql/test/suite/rpl/t/rpl_plugin_
6674share/mysql/test/suite/rpl/t/rpl_plugin_load.test 6740share/mysql/test/suite/rpl/t/rpl_plugin_load.test
6675share/mysql/test/suite/rpl/t/rpl_ps.test 6741share/mysql/test/suite/rpl/t/rpl_ps.test
6676share/mysql/test/suite/rpl/t/rpl_rbr_to_sbr.test 6742share/mysql/test/suite/rpl/t/rpl_rbr_to_sbr.test
6677share/mysql/test/suite/rpl/t/rpl_read_old_relay_log_info.test 6743share/mysql/test/suite/rpl/t/rpl_read_old_relay_log_info.test
6678share/mysql/test/suite/rpl/t/rpl_read_only.test 6744share/mysql/test/suite/rpl/t/rpl_read_only.test
6679share/mysql/test/suite/rpl/t/rpl_relay_space_innodb.test 6745share/mysql/test/suite/rpl/t/rpl_relay_space_innodb.test
6680share/mysql/test/suite/rpl/t/rpl_relay_space_myisam.test 6746share/mysql/test/suite/rpl/t/rpl_relay_space_myisam.test
6681share/mysql/test/suite/rpl/t/rpl_relayrotate-slave.opt 6747share/mysql/test/suite/rpl/t/rpl_relayrotate-slave.opt
6682share/mysql/test/suite/rpl/t/rpl_relayrotate.test 6748share/mysql/test/suite/rpl/t/rpl_relayrotate.test
6683share/mysql/test/suite/rpl/t/rpl_relayspace-slave.opt 6749share/mysql/test/suite/rpl/t/rpl_relayspace-slave.opt
6684share/mysql/test/suite/rpl/t/rpl_relayspace.test 6750share/mysql/test/suite/rpl/t/rpl_relayspace.test
6685share/mysql/test/suite/rpl/t/rpl_replicate_do-slave.opt 6751share/mysql/test/suite/rpl/t/rpl_replicate_do-slave.opt
6686share/mysql/test/suite/rpl/t/rpl_replicate_do.test 6752share/mysql/test/suite/rpl/t/rpl_replicate_do.test
 6753share/mysql/test/suite/rpl/t/rpl_replicate_event_after_sync_stage.test
6687share/mysql/test/suite/rpl/t/rpl_replicate_ignore_db-slave.opt 6754share/mysql/test/suite/rpl/t/rpl_replicate_ignore_db-slave.opt
6688share/mysql/test/suite/rpl/t/rpl_replicate_ignore_db.test 6755share/mysql/test/suite/rpl/t/rpl_replicate_ignore_db.test
6689share/mysql/test/suite/rpl/t/rpl_replicate_rewrite_db.test 6756share/mysql/test/suite/rpl/t/rpl_replicate_rewrite_db.test
6690share/mysql/test/suite/rpl/t/rpl_report-slave.opt 6757share/mysql/test/suite/rpl/t/rpl_report-slave.opt
6691share/mysql/test/suite/rpl/t/rpl_report.test 6758share/mysql/test/suite/rpl/t/rpl_report.test
6692share/mysql/test/suite/rpl/t/rpl_report_port-master.opt 6759share/mysql/test/suite/rpl/t/rpl_report_port-master.opt
6693share/mysql/test/suite/rpl/t/rpl_report_port.test 6760share/mysql/test/suite/rpl/t/rpl_report_port.test
6694share/mysql/test/suite/rpl/t/rpl_rewrite_db_filter-master.opt 6761share/mysql/test/suite/rpl/t/rpl_rewrite_db_filter-master.opt
6695share/mysql/test/suite/rpl/t/rpl_rewrite_db_filter-slave.opt 6762share/mysql/test/suite/rpl/t/rpl_rewrite_db_filter-slave.opt
6696share/mysql/test/suite/rpl/t/rpl_rewrite_db_filter.test 6763share/mysql/test/suite/rpl/t/rpl_rewrite_db_filter.test
6697share/mysql/test/suite/rpl/t/rpl_rewrt_db-slave.opt 6764share/mysql/test/suite/rpl/t/rpl_rewrt_db-slave.opt
6698share/mysql/test/suite/rpl/t/rpl_rewrt_db.test 6765share/mysql/test/suite/rpl/t/rpl_rewrt_db.test
6699share/mysql/test/suite/rpl/t/rpl_rotate_logs.cnf 6766share/mysql/test/suite/rpl/t/rpl_rotate_logs.cnf
@@ -6823,49 +6890,53 @@ share/mysql/test/suite/rpl/t/rpl_semi_sy @@ -6823,49 +6890,53 @@ share/mysql/test/suite/rpl/t/rpl_semi_sy
6823share/mysql/test/suite/rpl/t/rpl_semi_sync_event-master.opt 6890share/mysql/test/suite/rpl/t/rpl_semi_sync_event-master.opt
6824share/mysql/test/suite/rpl/t/rpl_semi_sync_event-slave.opt 6891share/mysql/test/suite/rpl/t/rpl_semi_sync_event-slave.opt
6825share/mysql/test/suite/rpl/t/rpl_semi_sync_event.test 6892share/mysql/test/suite/rpl/t/rpl_semi_sync_event.test
6826share/mysql/test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock-master.opt 6893share/mysql/test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock-master.opt
6827share/mysql/test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock-slave.opt 6894share/mysql/test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock-slave.opt
6828share/mysql/test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock.test 6895share/mysql/test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock.test
6829share/mysql/test/suite/rpl/t/rpl_semi_sync_non_group_commit_deadlock-master.opt 6896share/mysql/test/suite/rpl/t/rpl_semi_sync_non_group_commit_deadlock-master.opt
6830share/mysql/test/suite/rpl/t/rpl_semi_sync_non_group_commit_deadlock-slave.opt 6897share/mysql/test/suite/rpl/t/rpl_semi_sync_non_group_commit_deadlock-slave.opt
6831share/mysql/test/suite/rpl/t/rpl_semi_sync_non_group_commit_deadlock.test 6898share/mysql/test/suite/rpl/t/rpl_semi_sync_non_group_commit_deadlock.test
6832share/mysql/test/suite/rpl/t/rpl_sequential-master.opt 6899share/mysql/test/suite/rpl/t/rpl_sequential-master.opt
6833share/mysql/test/suite/rpl/t/rpl_sequential-slave.opt 6900share/mysql/test/suite/rpl/t/rpl_sequential-slave.opt
6834share/mysql/test/suite/rpl/t/rpl_sequential.test 6901share/mysql/test/suite/rpl/t/rpl_sequential.test
6835share/mysql/test/suite/rpl/t/rpl_server_id1.test 6902share/mysql/test/suite/rpl/t/rpl_server_id1.test
 6903share/mysql/test/suite/rpl/t/rpl_server_id2-master.opt
6836share/mysql/test/suite/rpl/t/rpl_server_id2-slave.opt 6904share/mysql/test/suite/rpl/t/rpl_server_id2-slave.opt
6837share/mysql/test/suite/rpl/t/rpl_server_id2.test 6905share/mysql/test/suite/rpl/t/rpl_server_id2.test
 6906share/mysql/test/suite/rpl/t/rpl_server_id_ignore-master.opt
6838share/mysql/test/suite/rpl/t/rpl_server_id_ignore-slave.opt 6907share/mysql/test/suite/rpl/t/rpl_server_id_ignore-slave.opt
6839share/mysql/test/suite/rpl/t/rpl_server_id_ignore.test 6908share/mysql/test/suite/rpl/t/rpl_server_id_ignore.test
6840share/mysql/test/suite/rpl/t/rpl_server_uuid.cnf 6909share/mysql/test/suite/rpl/t/rpl_server_uuid.cnf
6841share/mysql/test/suite/rpl/t/rpl_server_uuid.test 6910share/mysql/test/suite/rpl/t/rpl_server_uuid.test
6842share/mysql/test/suite/rpl/t/rpl_session_var.test 6911share/mysql/test/suite/rpl/t/rpl_session_var.test
6843share/mysql/test/suite/rpl/t/rpl_set_charset.test 6912share/mysql/test/suite/rpl/t/rpl_set_charset.test
6844share/mysql/test/suite/rpl/t/rpl_set_null_innodb.test 6913share/mysql/test/suite/rpl/t/rpl_set_null_innodb.test
6845share/mysql/test/suite/rpl/t/rpl_set_null_myisam.test 6914share/mysql/test/suite/rpl/t/rpl_set_null_myisam.test
6846share/mysql/test/suite/rpl/t/rpl_show_errors.test 6915share/mysql/test/suite/rpl/t/rpl_show_errors.test
6847share/mysql/test/suite/rpl/t/rpl_show_master_info_file-master.opt 6916share/mysql/test/suite/rpl/t/rpl_show_master_info_file-master.opt
6848share/mysql/test/suite/rpl/t/rpl_show_master_info_file.test 6917share/mysql/test/suite/rpl/t/rpl_show_master_info_file.test
6849share/mysql/test/suite/rpl/t/rpl_show_slave_hosts.cnf 6918share/mysql/test/suite/rpl/t/rpl_show_slave_hosts.cnf
6850share/mysql/test/suite/rpl/t/rpl_show_slave_hosts.test 6919share/mysql/test/suite/rpl/t/rpl_show_slave_hosts.test
6851share/mysql/test/suite/rpl/t/rpl_show_slave_running.test 6920share/mysql/test/suite/rpl/t/rpl_show_slave_running.test
6852share/mysql/test/suite/rpl/t/rpl_skip_ddl_errors_cli-slave.opt 6921share/mysql/test/suite/rpl/t/rpl_skip_ddl_errors_cli-slave.opt
6853share/mysql/test/suite/rpl/t/rpl_skip_ddl_errors_cli.test 6922share/mysql/test/suite/rpl/t/rpl_skip_ddl_errors_cli.test
6854share/mysql/test/suite/rpl/t/rpl_skip_error-slave.opt 6923share/mysql/test/suite/rpl/t/rpl_skip_error-slave.opt
6855share/mysql/test/suite/rpl/t/rpl_skip_error.test 6924share/mysql/test/suite/rpl/t/rpl_skip_error.test
6856share/mysql/test/suite/rpl/t/rpl_skip_incident-master.opt 6925share/mysql/test/suite/rpl/t/rpl_skip_incident-master.opt
6857share/mysql/test/suite/rpl/t/rpl_skip_incident-slave.opt 6926share/mysql/test/suite/rpl/t/rpl_skip_incident-slave.opt
6858share/mysql/test/suite/rpl/t/rpl_skip_incident.test 6927share/mysql/test/suite/rpl/t/rpl_skip_incident.test
 6928share/mysql/test/suite/rpl/t/rpl_skip_slave_err_warnings-slave.opt
 6929share/mysql/test/suite/rpl/t/rpl_skip_slave_err_warnings.test
6859share/mysql/test/suite/rpl/t/rpl_slave_grp_exec.test 6930share/mysql/test/suite/rpl/t/rpl_slave_grp_exec.test
6860share/mysql/test/suite/rpl/t/rpl_slave_load_in.test 6931share/mysql/test/suite/rpl/t/rpl_slave_load_in.test
6861share/mysql/test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test 6932share/mysql/test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
6862share/mysql/test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-master.opt 6933share/mysql/test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-master.opt
6863share/mysql/test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-slave.opt 6934share/mysql/test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-slave.opt
6864share/mysql/test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test 6935share/mysql/test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test
6865share/mysql/test/suite/rpl/t/rpl_slave_skip.test 6936share/mysql/test/suite/rpl/t/rpl_slave_skip.test
6866share/mysql/test/suite/rpl/t/rpl_slave_start.test 6937share/mysql/test/suite/rpl/t/rpl_slave_start.test
6867share/mysql/test/suite/rpl/t/rpl_slave_status.test 6938share/mysql/test/suite/rpl/t/rpl_slave_status.test
6868share/mysql/test/suite/rpl/t/rpl_slow_query_log-slave.opt 6939share/mysql/test/suite/rpl/t/rpl_slow_query_log-slave.opt
6869share/mysql/test/suite/rpl/t/rpl_slow_query_log.test 6940share/mysql/test/suite/rpl/t/rpl_slow_query_log.test
6870share/mysql/test/suite/rpl/t/rpl_sp-master.opt 6941share/mysql/test/suite/rpl/t/rpl_sp-master.opt
6871share/mysql/test/suite/rpl/t/rpl_sp-slave.opt 6942share/mysql/test/suite/rpl/t/rpl_sp-slave.opt
@@ -7084,26 +7155,27 @@ share/mysql/test/suite/sys_vars/r/basedi @@ -7084,26 +7155,27 @@ share/mysql/test/suite/sys_vars/r/basedi
7084share/mysql/test/suite/sys_vars/r/big_tables_basic.result 7155share/mysql/test/suite/sys_vars/r/big_tables_basic.result
7085share/mysql/test/suite/sys_vars/r/bind_address_basic.result 7156share/mysql/test/suite/sys_vars/r/bind_address_basic.result
7086share/mysql/test/suite/sys_vars/r/binlog_cache_size_basic_32.result 7157share/mysql/test/suite/sys_vars/r/binlog_cache_size_basic_32.result
7087share/mysql/test/suite/sys_vars/r/binlog_cache_size_basic_64.result 7158share/mysql/test/suite/sys_vars/r/binlog_cache_size_basic_64.result
7088share/mysql/test/suite/sys_vars/r/binlog_checksum_basic.result 7159share/mysql/test/suite/sys_vars/r/binlog_checksum_basic.result
7089share/mysql/test/suite/sys_vars/r/binlog_direct_non_transactional_updates_basic.result 7160share/mysql/test/suite/sys_vars/r/binlog_direct_non_transactional_updates_basic.result
7090share/mysql/test/suite/sys_vars/r/binlog_format_basic.result 7161share/mysql/test/suite/sys_vars/r/binlog_format_basic.result
7091share/mysql/test/suite/sys_vars/r/binlog_max_flush_queue_time_basic.result 7162share/mysql/test/suite/sys_vars/r/binlog_max_flush_queue_time_basic.result
7092share/mysql/test/suite/sys_vars/r/binlog_order_commits_basic.result 7163share/mysql/test/suite/sys_vars/r/binlog_order_commits_basic.result
7093share/mysql/test/suite/sys_vars/r/binlog_row_image_basic.result 7164share/mysql/test/suite/sys_vars/r/binlog_row_image_basic.result
7094share/mysql/test/suite/sys_vars/r/binlog_rows_query_log_events_basic.result 7165share/mysql/test/suite/sys_vars/r/binlog_rows_query_log_events_basic.result
7095share/mysql/test/suite/sys_vars/r/binlog_stmt_cache_size_basic_32.result 7166share/mysql/test/suite/sys_vars/r/binlog_stmt_cache_size_basic_32.result
7096share/mysql/test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result 7167share/mysql/test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result
 7168share/mysql/test/suite/sys_vars/r/block_encryption_mode_basic.result
7097share/mysql/test/suite/sys_vars/r/bulk_insert_buffer_size_basic_32.result 7169share/mysql/test/suite/sys_vars/r/bulk_insert_buffer_size_basic_32.result
7098share/mysql/test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result 7170share/mysql/test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result
7099share/mysql/test/suite/sys_vars/r/character_set_client_basic.result 7171share/mysql/test/suite/sys_vars/r/character_set_client_basic.result
7100share/mysql/test/suite/sys_vars/r/character_set_client_func.result 7172share/mysql/test/suite/sys_vars/r/character_set_client_func.result
7101share/mysql/test/suite/sys_vars/r/character_set_connection_basic.result 7173share/mysql/test/suite/sys_vars/r/character_set_connection_basic.result
7102share/mysql/test/suite/sys_vars/r/character_set_connection_func.result 7174share/mysql/test/suite/sys_vars/r/character_set_connection_func.result
7103share/mysql/test/suite/sys_vars/r/character_set_database_basic.result 7175share/mysql/test/suite/sys_vars/r/character_set_database_basic.result
7104share/mysql/test/suite/sys_vars/r/character_set_database_func.result 7176share/mysql/test/suite/sys_vars/r/character_set_database_func.result
7105share/mysql/test/suite/sys_vars/r/character_set_filesystem_basic.result 7177share/mysql/test/suite/sys_vars/r/character_set_filesystem_basic.result
7106share/mysql/test/suite/sys_vars/r/character_set_results_basic.result 7178share/mysql/test/suite/sys_vars/r/character_set_results_basic.result
7107share/mysql/test/suite/sys_vars/r/character_set_results_func.result 7179share/mysql/test/suite/sys_vars/r/character_set_results_func.result
7108share/mysql/test/suite/sys_vars/r/character_set_server_basic.result 7180share/mysql/test/suite/sys_vars/r/character_set_server_basic.result
7109share/mysql/test/suite/sys_vars/r/character_set_server_func.result 7181share/mysql/test/suite/sys_vars/r/character_set_server_func.result
@@ -7220,26 +7292,27 @@ share/mysql/test/suite/sys_vars/r/innodb @@ -7220,26 +7292,27 @@ share/mysql/test/suite/sys_vars/r/innodb
7220share/mysql/test/suite/sys_vars/r/innodb_cmp_per_index_enabled_basic.result 7292share/mysql/test/suite/sys_vars/r/innodb_cmp_per_index_enabled_basic.result
7221share/mysql/test/suite/sys_vars/r/innodb_commit_concurrency_basic.result 7293share/mysql/test/suite/sys_vars/r/innodb_commit_concurrency_basic.result
7222share/mysql/test/suite/sys_vars/r/innodb_compression_failure_threshold_pct_basic.result 7294share/mysql/test/suite/sys_vars/r/innodb_compression_failure_threshold_pct_basic.result
7223share/mysql/test/suite/sys_vars/r/innodb_compression_level_basic.result 7295share/mysql/test/suite/sys_vars/r/innodb_compression_level_basic.result
7224share/mysql/test/suite/sys_vars/r/innodb_compression_pad_pct_max_basic.result 7296share/mysql/test/suite/sys_vars/r/innodb_compression_pad_pct_max_basic.result
7225share/mysql/test/suite/sys_vars/r/innodb_concurrency_tickets_basic.result 7297share/mysql/test/suite/sys_vars/r/innodb_concurrency_tickets_basic.result
7226share/mysql/test/suite/sys_vars/r/innodb_data_file_path_basic.result 7298share/mysql/test/suite/sys_vars/r/innodb_data_file_path_basic.result
7227share/mysql/test/suite/sys_vars/r/innodb_data_home_dir_basic.result 7299share/mysql/test/suite/sys_vars/r/innodb_data_home_dir_basic.result
7228share/mysql/test/suite/sys_vars/r/innodb_disable_background_merge_basic.result 7300share/mysql/test/suite/sys_vars/r/innodb_disable_background_merge_basic.result
7229share/mysql/test/suite/sys_vars/r/innodb_disable_sort_file_cache_basic.result 7301share/mysql/test/suite/sys_vars/r/innodb_disable_sort_file_cache_basic.result
7230share/mysql/test/suite/sys_vars/r/innodb_doublewrite_basic.result 7302share/mysql/test/suite/sys_vars/r/innodb_doublewrite_basic.result
7231share/mysql/test/suite/sys_vars/r/innodb_doublewrite_batch_size_basic.result 7303share/mysql/test/suite/sys_vars/r/innodb_doublewrite_batch_size_basic.result
7232share/mysql/test/suite/sys_vars/r/innodb_fast_shutdown_basic.result 7304share/mysql/test/suite/sys_vars/r/innodb_fast_shutdown_basic.result
 7305share/mysql/test/suite/sys_vars/r/innodb_fil_make_page_dirty_debug_basic.result
7233share/mysql/test/suite/sys_vars/r/innodb_file_format_basic.result 7306share/mysql/test/suite/sys_vars/r/innodb_file_format_basic.result
7234share/mysql/test/suite/sys_vars/r/innodb_file_format_check_basic.result 7307share/mysql/test/suite/sys_vars/r/innodb_file_format_check_basic.result
7235share/mysql/test/suite/sys_vars/r/innodb_file_format_max_basic.result 7308share/mysql/test/suite/sys_vars/r/innodb_file_format_max_basic.result
7236share/mysql/test/suite/sys_vars/r/innodb_file_io_threads_basic.result 7309share/mysql/test/suite/sys_vars/r/innodb_file_io_threads_basic.result
7237share/mysql/test/suite/sys_vars/r/innodb_file_per_table_basic.result 7310share/mysql/test/suite/sys_vars/r/innodb_file_per_table_basic.result
7238share/mysql/test/suite/sys_vars/r/innodb_flush_log_at_timeout_basic.result 7311share/mysql/test/suite/sys_vars/r/innodb_flush_log_at_timeout_basic.result
7239share/mysql/test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result 7312share/mysql/test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result
7240share/mysql/test/suite/sys_vars/r/innodb_flush_method_basic.result 7313share/mysql/test/suite/sys_vars/r/innodb_flush_method_basic.result
7241share/mysql/test/suite/sys_vars/r/innodb_flush_neighbors_basic.result 7314share/mysql/test/suite/sys_vars/r/innodb_flush_neighbors_basic.result
7242share/mysql/test/suite/sys_vars/r/innodb_flushing_avg_loops_basic.result 7315share/mysql/test/suite/sys_vars/r/innodb_flushing_avg_loops_basic.result
7243share/mysql/test/suite/sys_vars/r/innodb_force_load_corrupted_basic.result 7316share/mysql/test/suite/sys_vars/r/innodb_force_load_corrupted_basic.result
7244share/mysql/test/suite/sys_vars/r/innodb_force_recovery_basic.result 7317share/mysql/test/suite/sys_vars/r/innodb_force_recovery_basic.result
7245share/mysql/test/suite/sys_vars/r/innodb_force_recovery_crash_basic.result 7318share/mysql/test/suite/sys_vars/r/innodb_force_recovery_crash_basic.result
@@ -7287,26 +7360,27 @@ share/mysql/test/suite/sys_vars/r/innodb @@ -7287,26 +7360,27 @@ share/mysql/test/suite/sys_vars/r/innodb
7287share/mysql/test/suite/sys_vars/r/innodb_page_size_basic.result 7360share/mysql/test/suite/sys_vars/r/innodb_page_size_basic.result
7288share/mysql/test/suite/sys_vars/r/innodb_print_all_deadlocks_basic.result 7361share/mysql/test/suite/sys_vars/r/innodb_print_all_deadlocks_basic.result
7289share/mysql/test/suite/sys_vars/r/innodb_purge_batch_size_basic.result 7362share/mysql/test/suite/sys_vars/r/innodb_purge_batch_size_basic.result
7290share/mysql/test/suite/sys_vars/r/innodb_purge_run_now_basic.result 7363share/mysql/test/suite/sys_vars/r/innodb_purge_run_now_basic.result
7291share/mysql/test/suite/sys_vars/r/innodb_purge_stop_now_basic.result 7364share/mysql/test/suite/sys_vars/r/innodb_purge_stop_now_basic.result
7292share/mysql/test/suite/sys_vars/r/innodb_purge_threads_basic.result 7365share/mysql/test/suite/sys_vars/r/innodb_purge_threads_basic.result
7293share/mysql/test/suite/sys_vars/r/innodb_random_read_ahead_basic.result 7366share/mysql/test/suite/sys_vars/r/innodb_random_read_ahead_basic.result
7294share/mysql/test/suite/sys_vars/r/innodb_read_ahead_threshold_basic.result 7367share/mysql/test/suite/sys_vars/r/innodb_read_ahead_threshold_basic.result
7295share/mysql/test/suite/sys_vars/r/innodb_read_io_threads_basic.result 7368share/mysql/test/suite/sys_vars/r/innodb_read_io_threads_basic.result
7296share/mysql/test/suite/sys_vars/r/innodb_read_only_basic.result 7369share/mysql/test/suite/sys_vars/r/innodb_read_only_basic.result
7297share/mysql/test/suite/sys_vars/r/innodb_replication_delay_basic.result 7370share/mysql/test/suite/sys_vars/r/innodb_replication_delay_basic.result
7298share/mysql/test/suite/sys_vars/r/innodb_rollback_on_timeout_basic.result 7371share/mysql/test/suite/sys_vars/r/innodb_rollback_on_timeout_basic.result
7299share/mysql/test/suite/sys_vars/r/innodb_rollback_segments_basic.result 7372share/mysql/test/suite/sys_vars/r/innodb_rollback_segments_basic.result
 7373share/mysql/test/suite/sys_vars/r/innodb_saved_page_number_debug_basic.result
7300share/mysql/test/suite/sys_vars/r/innodb_sort_buffer_size_basic.result 7374share/mysql/test/suite/sys_vars/r/innodb_sort_buffer_size_basic.result
7301share/mysql/test/suite/sys_vars/r/innodb_spin_wait_delay_basic.result 7375share/mysql/test/suite/sys_vars/r/innodb_spin_wait_delay_basic.result
7302share/mysql/test/suite/sys_vars/r/innodb_stats_auto_recalc_basic.result 7376share/mysql/test/suite/sys_vars/r/innodb_stats_auto_recalc_basic.result
7303share/mysql/test/suite/sys_vars/r/innodb_stats_method_basic.result 7377share/mysql/test/suite/sys_vars/r/innodb_stats_method_basic.result
7304share/mysql/test/suite/sys_vars/r/innodb_stats_on_metadata_basic.result 7378share/mysql/test/suite/sys_vars/r/innodb_stats_on_metadata_basic.result
7305share/mysql/test/suite/sys_vars/r/innodb_stats_persistent_basic.result 7379share/mysql/test/suite/sys_vars/r/innodb_stats_persistent_basic.result
7306share/mysql/test/suite/sys_vars/r/innodb_stats_persistent_sample_pages_basic.result 7380share/mysql/test/suite/sys_vars/r/innodb_stats_persistent_sample_pages_basic.result
7307share/mysql/test/suite/sys_vars/r/innodb_stats_sample_pages_basic.result 7381share/mysql/test/suite/sys_vars/r/innodb_stats_sample_pages_basic.result
7308share/mysql/test/suite/sys_vars/r/innodb_stats_transient_sample_pages_basic.result 7382share/mysql/test/suite/sys_vars/r/innodb_stats_transient_sample_pages_basic.result
7309share/mysql/test/suite/sys_vars/r/innodb_status_output_basic.result 7383share/mysql/test/suite/sys_vars/r/innodb_status_output_basic.result
7310share/mysql/test/suite/sys_vars/r/innodb_status_output_locks_basic.result 7384share/mysql/test/suite/sys_vars/r/innodb_status_output_locks_basic.result
7311share/mysql/test/suite/sys_vars/r/innodb_strict_mode_basic.result 7385share/mysql/test/suite/sys_vars/r/innodb_strict_mode_basic.result
7312share/mysql/test/suite/sys_vars/r/innodb_support_xa_basic.result 7386share/mysql/test/suite/sys_vars/r/innodb_support_xa_basic.result
@@ -7675,26 +7749,27 @@ share/mysql/test/suite/sys_vars/t/basedi @@ -7675,26 +7749,27 @@ share/mysql/test/suite/sys_vars/t/basedi
7675share/mysql/test/suite/sys_vars/t/big_tables_basic.test 7749share/mysql/test/suite/sys_vars/t/big_tables_basic.test
7676share/mysql/test/suite/sys_vars/t/bind_address_basic.test 7750share/mysql/test/suite/sys_vars/t/bind_address_basic.test
7677share/mysql/test/suite/sys_vars/t/binlog_cache_size_basic_32.test 7751share/mysql/test/suite/sys_vars/t/binlog_cache_size_basic_32.test
7678share/mysql/test/suite/sys_vars/t/binlog_cache_size_basic_64.test 7752share/mysql/test/suite/sys_vars/t/binlog_cache_size_basic_64.test
7679share/mysql/test/suite/sys_vars/t/binlog_checksum_basic.test 7753share/mysql/test/suite/sys_vars/t/binlog_checksum_basic.test
7680share/mysql/test/suite/sys_vars/t/binlog_direct_non_transactional_updates_basic.test 7754share/mysql/test/suite/sys_vars/t/binlog_direct_non_transactional_updates_basic.test
7681share/mysql/test/suite/sys_vars/t/binlog_format_basic.test 7755share/mysql/test/suite/sys_vars/t/binlog_format_basic.test
7682share/mysql/test/suite/sys_vars/t/binlog_max_flush_queue_time_basic.test 7756share/mysql/test/suite/sys_vars/t/binlog_max_flush_queue_time_basic.test
7683share/mysql/test/suite/sys_vars/t/binlog_order_commits_basic.test 7757share/mysql/test/suite/sys_vars/t/binlog_order_commits_basic.test
7684share/mysql/test/suite/sys_vars/t/binlog_row_image_basic.test 7758share/mysql/test/suite/sys_vars/t/binlog_row_image_basic.test
7685share/mysql/test/suite/sys_vars/t/binlog_rows_query_log_events_basic.test 7759share/mysql/test/suite/sys_vars/t/binlog_rows_query_log_events_basic.test
7686share/mysql/test/suite/sys_vars/t/binlog_stmt_cache_size_basic_32.test 7760share/mysql/test/suite/sys_vars/t/binlog_stmt_cache_size_basic_32.test
7687share/mysql/test/suite/sys_vars/t/binlog_stmt_cache_size_basic_64.test 7761share/mysql/test/suite/sys_vars/t/binlog_stmt_cache_size_basic_64.test
 7762share/mysql/test/suite/sys_vars/t/block_encryption_mode_basic.test
7688share/mysql/test/suite/sys_vars/t/bulk_insert_buffer_size_basic_32.test 7763share/mysql/test/suite/sys_vars/t/bulk_insert_buffer_size_basic_32.test
7689share/mysql/test/suite/sys_vars/t/bulk_insert_buffer_size_basic_64.test 7764share/mysql/test/suite/sys_vars/t/bulk_insert_buffer_size_basic_64.test
7690share/mysql/test/suite/sys_vars/t/character_set_client_basic.test 7765share/mysql/test/suite/sys_vars/t/character_set_client_basic.test
7691share/mysql/test/suite/sys_vars/t/character_set_client_func.test 7766share/mysql/test/suite/sys_vars/t/character_set_client_func.test
7692share/mysql/test/suite/sys_vars/t/character_set_connection_basic.test 7767share/mysql/test/suite/sys_vars/t/character_set_connection_basic.test
7693share/mysql/test/suite/sys_vars/t/character_set_connection_func.test 7768share/mysql/test/suite/sys_vars/t/character_set_connection_func.test
7694share/mysql/test/suite/sys_vars/t/character_set_database_basic.test 7769share/mysql/test/suite/sys_vars/t/character_set_database_basic.test
7695share/mysql/test/suite/sys_vars/t/character_set_database_func.test 7770share/mysql/test/suite/sys_vars/t/character_set_database_func.test
7696share/mysql/test/suite/sys_vars/t/character_set_filesystem_basic.test 7771share/mysql/test/suite/sys_vars/t/character_set_filesystem_basic.test
7697share/mysql/test/suite/sys_vars/t/character_set_filesystem_func-master.opt 7772share/mysql/test/suite/sys_vars/t/character_set_filesystem_func-master.opt
7698share/mysql/test/suite/sys_vars/t/character_set_results_basic.test 7773share/mysql/test/suite/sys_vars/t/character_set_results_basic.test
7699share/mysql/test/suite/sys_vars/t/character_set_results_func.test 7774share/mysql/test/suite/sys_vars/t/character_set_results_func.test
7700share/mysql/test/suite/sys_vars/t/character_set_server_basic.test 7775share/mysql/test/suite/sys_vars/t/character_set_server_basic.test
@@ -7822,26 +7897,27 @@ share/mysql/test/suite/sys_vars/t/innodb @@ -7822,26 +7897,27 @@ share/mysql/test/suite/sys_vars/t/innodb
7822share/mysql/test/suite/sys_vars/t/innodb_cmp_per_index_enabled_basic.test 7897share/mysql/test/suite/sys_vars/t/innodb_cmp_per_index_enabled_basic.test
7823share/mysql/test/suite/sys_vars/t/innodb_commit_concurrency_basic.test 7898share/mysql/test/suite/sys_vars/t/innodb_commit_concurrency_basic.test
7824share/mysql/test/suite/sys_vars/t/innodb_compression_failure_threshold_pct_basic.test 7899share/mysql/test/suite/sys_vars/t/innodb_compression_failure_threshold_pct_basic.test
7825share/mysql/test/suite/sys_vars/t/innodb_compression_level_basic.test 7900share/mysql/test/suite/sys_vars/t/innodb_compression_level_basic.test
7826share/mysql/test/suite/sys_vars/t/innodb_compression_pad_pct_max_basic.test 7901share/mysql/test/suite/sys_vars/t/innodb_compression_pad_pct_max_basic.test
7827share/mysql/test/suite/sys_vars/t/innodb_concurrency_tickets_basic.test 7902share/mysql/test/suite/sys_vars/t/innodb_concurrency_tickets_basic.test
7828share/mysql/test/suite/sys_vars/t/innodb_data_file_path_basic.test 7903share/mysql/test/suite/sys_vars/t/innodb_data_file_path_basic.test
7829share/mysql/test/suite/sys_vars/t/innodb_data_home_dir_basic.test 7904share/mysql/test/suite/sys_vars/t/innodb_data_home_dir_basic.test
7830share/mysql/test/suite/sys_vars/t/innodb_disable_background_merge_basic.test 7905share/mysql/test/suite/sys_vars/t/innodb_disable_background_merge_basic.test
7831share/mysql/test/suite/sys_vars/t/innodb_disable_sort_file_cache_basic.test 7906share/mysql/test/suite/sys_vars/t/innodb_disable_sort_file_cache_basic.test
7832share/mysql/test/suite/sys_vars/t/innodb_doublewrite_basic.test 7907share/mysql/test/suite/sys_vars/t/innodb_doublewrite_basic.test
7833share/mysql/test/suite/sys_vars/t/innodb_doublewrite_batch_size_basic.test 7908share/mysql/test/suite/sys_vars/t/innodb_doublewrite_batch_size_basic.test
7834share/mysql/test/suite/sys_vars/t/innodb_fast_shutdown_basic.test 7909share/mysql/test/suite/sys_vars/t/innodb_fast_shutdown_basic.test
 7910share/mysql/test/suite/sys_vars/t/innodb_fil_make_page_dirty_debug_basic.test
7835share/mysql/test/suite/sys_vars/t/innodb_file_format_basic.test 7911share/mysql/test/suite/sys_vars/t/innodb_file_format_basic.test
7836share/mysql/test/suite/sys_vars/t/innodb_file_format_check_basic.test 7912share/mysql/test/suite/sys_vars/t/innodb_file_format_check_basic.test
7837share/mysql/test/suite/sys_vars/t/innodb_file_format_max_basic-master.opt 7913share/mysql/test/suite/sys_vars/t/innodb_file_format_max_basic-master.opt
7838share/mysql/test/suite/sys_vars/t/innodb_file_format_max_basic.test 7914share/mysql/test/suite/sys_vars/t/innodb_file_format_max_basic.test
7839share/mysql/test/suite/sys_vars/t/innodb_file_io_threads_basic.test 7915share/mysql/test/suite/sys_vars/t/innodb_file_io_threads_basic.test
7840share/mysql/test/suite/sys_vars/t/innodb_file_per_table_basic-master.opt 7916share/mysql/test/suite/sys_vars/t/innodb_file_per_table_basic-master.opt
7841share/mysql/test/suite/sys_vars/t/innodb_file_per_table_basic.test 7917share/mysql/test/suite/sys_vars/t/innodb_file_per_table_basic.test
7842share/mysql/test/suite/sys_vars/t/innodb_flush_log_at_timeout_basic.test 7918share/mysql/test/suite/sys_vars/t/innodb_flush_log_at_timeout_basic.test
7843share/mysql/test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test 7919share/mysql/test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test
7844share/mysql/test/suite/sys_vars/t/innodb_flush_method_basic.test 7920share/mysql/test/suite/sys_vars/t/innodb_flush_method_basic.test
7845share/mysql/test/suite/sys_vars/t/innodb_flush_neighbors_basic.test 7921share/mysql/test/suite/sys_vars/t/innodb_flush_neighbors_basic.test
7846share/mysql/test/suite/sys_vars/t/innodb_flushing_avg_loops_basic.test 7922share/mysql/test/suite/sys_vars/t/innodb_flushing_avg_loops_basic.test
7847share/mysql/test/suite/sys_vars/t/innodb_force_load_corrupted_basic.test 7923share/mysql/test/suite/sys_vars/t/innodb_force_load_corrupted_basic.test
@@ -7891,26 +7967,27 @@ share/mysql/test/suite/sys_vars/t/innodb @@ -7891,26 +7967,27 @@ share/mysql/test/suite/sys_vars/t/innodb
7891share/mysql/test/suite/sys_vars/t/innodb_page_size_basic.test 7967share/mysql/test/suite/sys_vars/t/innodb_page_size_basic.test
7892share/mysql/test/suite/sys_vars/t/innodb_print_all_deadlocks_basic.test 7968share/mysql/test/suite/sys_vars/t/innodb_print_all_deadlocks_basic.test
7893share/mysql/test/suite/sys_vars/t/innodb_purge_batch_size_basic.test 7969share/mysql/test/suite/sys_vars/t/innodb_purge_batch_size_basic.test
7894share/mysql/test/suite/sys_vars/t/innodb_purge_run_now_basic.test 7970share/mysql/test/suite/sys_vars/t/innodb_purge_run_now_basic.test
7895share/mysql/test/suite/sys_vars/t/innodb_purge_stop_now_basic.test 7971share/mysql/test/suite/sys_vars/t/innodb_purge_stop_now_basic.test
7896share/mysql/test/suite/sys_vars/t/innodb_purge_threads_basic.test 7972share/mysql/test/suite/sys_vars/t/innodb_purge_threads_basic.test
7897share/mysql/test/suite/sys_vars/t/innodb_random_read_ahead_basic.test 7973share/mysql/test/suite/sys_vars/t/innodb_random_read_ahead_basic.test
7898share/mysql/test/suite/sys_vars/t/innodb_read_ahead_threshold_basic.test 7974share/mysql/test/suite/sys_vars/t/innodb_read_ahead_threshold_basic.test
7899share/mysql/test/suite/sys_vars/t/innodb_read_io_threads_basic.test 7975share/mysql/test/suite/sys_vars/t/innodb_read_io_threads_basic.test
7900share/mysql/test/suite/sys_vars/t/innodb_read_only_basic.test 7976share/mysql/test/suite/sys_vars/t/innodb_read_only_basic.test
7901share/mysql/test/suite/sys_vars/t/innodb_replication_delay_basic.test 7977share/mysql/test/suite/sys_vars/t/innodb_replication_delay_basic.test
7902share/mysql/test/suite/sys_vars/t/innodb_rollback_on_timeout_basic.test 7978share/mysql/test/suite/sys_vars/t/innodb_rollback_on_timeout_basic.test
7903share/mysql/test/suite/sys_vars/t/innodb_rollback_segments_basic.test 7979share/mysql/test/suite/sys_vars/t/innodb_rollback_segments_basic.test
 7980share/mysql/test/suite/sys_vars/t/innodb_saved_page_number_debug_basic.test
7904share/mysql/test/suite/sys_vars/t/innodb_sort_buffer_size_basic.test 7981share/mysql/test/suite/sys_vars/t/innodb_sort_buffer_size_basic.test
7905share/mysql/test/suite/sys_vars/t/innodb_spin_wait_delay_basic.test 7982share/mysql/test/suite/sys_vars/t/innodb_spin_wait_delay_basic.test
7906share/mysql/test/suite/sys_vars/t/innodb_stats_auto_recalc_basic.test 7983share/mysql/test/suite/sys_vars/t/innodb_stats_auto_recalc_basic.test
7907share/mysql/test/suite/sys_vars/t/innodb_stats_method_basic.test 7984share/mysql/test/suite/sys_vars/t/innodb_stats_method_basic.test
7908share/mysql/test/suite/sys_vars/t/innodb_stats_on_metadata_basic.test 7985share/mysql/test/suite/sys_vars/t/innodb_stats_on_metadata_basic.test
7909share/mysql/test/suite/sys_vars/t/innodb_stats_persistent_basic.test 7986share/mysql/test/suite/sys_vars/t/innodb_stats_persistent_basic.test
7910share/mysql/test/suite/sys_vars/t/innodb_stats_persistent_sample_pages_basic.test 7987share/mysql/test/suite/sys_vars/t/innodb_stats_persistent_sample_pages_basic.test
7911share/mysql/test/suite/sys_vars/t/innodb_stats_sample_pages_basic.test 7988share/mysql/test/suite/sys_vars/t/innodb_stats_sample_pages_basic.test
7912share/mysql/test/suite/sys_vars/t/innodb_stats_transient_sample_pages_basic.test 7989share/mysql/test/suite/sys_vars/t/innodb_stats_transient_sample_pages_basic.test
7913share/mysql/test/suite/sys_vars/t/innodb_status_output_basic.test 7990share/mysql/test/suite/sys_vars/t/innodb_status_output_basic.test
7914share/mysql/test/suite/sys_vars/t/innodb_status_output_locks_basic.test 7991share/mysql/test/suite/sys_vars/t/innodb_status_output_locks_basic.test
7915share/mysql/test/suite/sys_vars/t/innodb_strict_mode_basic.test 7992share/mysql/test/suite/sys_vars/t/innodb_strict_mode_basic.test
7916share/mysql/test/suite/sys_vars/t/innodb_support_xa_basic.test 7993share/mysql/test/suite/sys_vars/t/innodb_support_xa_basic.test
@@ -8516,26 +8593,32 @@ share/mysql/test/t/flush_table.test @@ -8516,26 +8593,32 @@ share/mysql/test/t/flush_table.test
8516share/mysql/test/t/foreign_key.test 8593share/mysql/test/t/foreign_key.test
8517share/mysql/test/t/fulltext.test 8594share/mysql/test/t/fulltext.test
8518share/mysql/test/t/fulltext2.test 8595share/mysql/test/t/fulltext2.test
8519share/mysql/test/t/fulltext3.test 8596share/mysql/test/t/fulltext3.test
8520share/mysql/test/t/fulltext_cache.test 8597share/mysql/test/t/fulltext_cache.test
8521share/mysql/test/t/fulltext_distinct.test 8598share/mysql/test/t/fulltext_distinct.test
8522share/mysql/test/t/fulltext_left_join.test 8599share/mysql/test/t/fulltext_left_join.test
8523share/mysql/test/t/fulltext_multi.test 8600share/mysql/test/t/fulltext_multi.test
8524share/mysql/test/t/fulltext_order_by.test 8601share/mysql/test/t/fulltext_order_by.test
8525share/mysql/test/t/fulltext_plugin-master.opt 8602share/mysql/test/t/fulltext_plugin-master.opt
8526share/mysql/test/t/fulltext_plugin.test 8603share/mysql/test/t/fulltext_plugin.test
8527share/mysql/test/t/fulltext_update.test 8604share/mysql/test/t/fulltext_update.test
8528share/mysql/test/t/fulltext_var.test 8605share/mysql/test/t/fulltext_var.test
 8606share/mysql/test/t/func_aes.test
 8607share/mysql/test/t/func_aes_cfb1.test
 8608share/mysql/test/t/func_aes_cfb128.test
 8609share/mysql/test/t/func_aes_cfb8.test
 8610share/mysql/test/t/func_aes_misc.test
 8611share/mysql/test/t/func_aes_ofb.test
8529share/mysql/test/t/func_analyse.test 8612share/mysql/test/t/func_analyse.test
8530share/mysql/test/t/func_compress.test 8613share/mysql/test/t/func_compress.test
8531share/mysql/test/t/func_concat.test 8614share/mysql/test/t/func_concat.test
8532share/mysql/test/t/func_crypt.test 8615share/mysql/test/t/func_crypt.test
8533share/mysql/test/t/func_date_add.test 8616share/mysql/test/t/func_date_add.test
8534share/mysql/test/t/func_default.test 8617share/mysql/test/t/func_default.test
8535share/mysql/test/t/func_des_encrypt.test 8618share/mysql/test/t/func_des_encrypt.test
8536share/mysql/test/t/func_digest.test 8619share/mysql/test/t/func_digest.test
8537share/mysql/test/t/func_encrypt-master.opt 8620share/mysql/test/t/func_encrypt-master.opt
8538share/mysql/test/t/func_encrypt.test 8621share/mysql/test/t/func_encrypt.test
8539share/mysql/test/t/func_encrypt_nossl.test 8622share/mysql/test/t/func_encrypt_nossl.test
8540share/mysql/test/t/func_encrypt_ucs2.test 8623share/mysql/test/t/func_encrypt_ucs2.test
8541share/mysql/test/t/func_equal.test 8624share/mysql/test/t/func_equal.test
@@ -8877,26 +8960,28 @@ share/mysql/test/t/partition_charset.tes @@ -8877,26 +8960,28 @@ share/mysql/test/t/partition_charset.tes
8877share/mysql/test/t/partition_column.test 8960share/mysql/test/t/partition_column.test
8878share/mysql/test/t/partition_column_prune.test 8961share/mysql/test/t/partition_column_prune.test
8879share/mysql/test/t/partition_csv.test 8962share/mysql/test/t/partition_csv.test
8880share/mysql/test/t/partition_datatype.test 8963share/mysql/test/t/partition_datatype.test
8881share/mysql/test/t/partition_debug_sync.test 8964share/mysql/test/t/partition_debug_sync.test
8882share/mysql/test/t/partition_disabled-master.opt 8965share/mysql/test/t/partition_disabled-master.opt
8883share/mysql/test/t/partition_disabled.test 8966share/mysql/test/t/partition_disabled.test
8884share/mysql/test/t/partition_error.test 8967share/mysql/test/t/partition_error.test
8885share/mysql/test/t/partition_exchange.test 8968share/mysql/test/t/partition_exchange.test
8886share/mysql/test/t/partition_explicit_prune.test 8969share/mysql/test/t/partition_explicit_prune.test
8887share/mysql/test/t/partition_federated.test 8970share/mysql/test/t/partition_federated.test
8888share/mysql/test/t/partition_grant.test 8971share/mysql/test/t/partition_grant.test
8889share/mysql/test/t/partition_hash.test 8972share/mysql/test/t/partition_hash.test
 8973share/mysql/test/t/partition_index_innodb.test
 8974share/mysql/test/t/partition_index_myisam.test
8890share/mysql/test/t/partition_innodb.test 8975share/mysql/test/t/partition_innodb.test
8891share/mysql/test/t/partition_innodb_plugin.test 8976share/mysql/test/t/partition_innodb_plugin.test
8892share/mysql/test/t/partition_innodb_semi_consistent-master.opt 8977share/mysql/test/t/partition_innodb_semi_consistent-master.opt
8893share/mysql/test/t/partition_innodb_semi_consistent.test 8978share/mysql/test/t/partition_innodb_semi_consistent.test
8894share/mysql/test/t/partition_innodb_stmt.test 8979share/mysql/test/t/partition_innodb_stmt.test
8895share/mysql/test/t/partition_innodb_tablespace.test 8980share/mysql/test/t/partition_innodb_tablespace.test
8896share/mysql/test/t/partition_key_cache.test 8981share/mysql/test/t/partition_key_cache.test
8897share/mysql/test/t/partition_list.test 8982share/mysql/test/t/partition_list.test
8898share/mysql/test/t/partition_locking.test 8983share/mysql/test/t/partition_locking.test
8899share/mysql/test/t/partition_locking_4.test 8984share/mysql/test/t/partition_locking_4.test
8900share/mysql/test/t/partition_mgm.test 8985share/mysql/test/t/partition_mgm.test
8901share/mysql/test/t/partition_mgm_err.test 8986share/mysql/test/t/partition_mgm_err.test
8902share/mysql/test/t/partition_mgm_err2.test 8987share/mysql/test/t/partition_mgm_err2.test