21164142 Upgrade the version of MySQL 5.6 to 5.6.25 on Solaris
authorMurthy Narkedimilli <murthy.narkedimilli@oracle.com>
Fri, 31 Jul 2015 05:46:44 -0700
changeset 4725 b637001b5b2d
parent 4724 7b96ca49258f
child 4726 4c4fc9ba31dd
21164142 Upgrade the version of MySQL 5.6 to 5.6.25 on Solaris 21451804 problem in DATABASE/MYSQL 21487074 problem in DATABASE/MYSQL
components/mysql-5-6/Makefile
components/mysql-5-6/mysql-56test.p5m
components/mysql-5-6/patches/bug21185883.patch
--- a/components/mysql-5-6/Makefile	Fri Jul 31 02:20:49 2015 -0700
+++ b/components/mysql-5-6/Makefile	Fri Jul 31 05:46:44 2015 -0700
@@ -24,15 +24,14 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME        = mysql
-COMPONENT_VERSION     = 5.6.21
+COMPONENT_VERSION     = 5.6.25
 COMPONENT_SRC         = $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE     = $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= \
-         sha256:ea4daf6a8f4b1a9c62e416249a08fbdcbf686667d738004ef82044def96feb7c
-COMPONENT_ARCHIVE_URL = http://downloads.mysql.com/archives/mysql-5.6/$(COMPONENT_ARCHIVE)
+         sha256:15079c0b83d33a092649cbdf402c9225bcd3f33e87388407be5cdbf1432c7fbd
+COMPONENT_ARCHIVE_URL = http://cdn.mysql.com/Downloads/MySQL-5.6/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL = http://dev.mysql.com/ 
 COMPONENT_BUGDB       = database/mysql
-COMPILER              = gcc
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/justmake.mk
@@ -41,6 +40,9 @@
 # Enable ASLR for this component
 ASLR_MODE           = $(ASLR_ENABLE)
 
+# MySQL being one of Oracle's own product doesn't require to have a
+# TPNO License number.
+
 # This component uses cmake to generate Makefiles and thus does not
 # run any configure script
 CMAKE               = /usr/bin/cmake
@@ -54,8 +56,10 @@
 CMAKE_LIBDIR.64     = lib/$(MACH64)
 CMAKE_PLUGINDIR.32  = lib/plugin
 CMAKE_PLUGINDIR.64  = lib/$(MACH64)/plugin
-CMAKE_CFLAGS.64     = -m64
-CMAKE_CXXFLAGS.64   = -m64
+CMAKE_CFLAGS.32     = -D__MATHERR_RENAME_EXCEPTION
+CMAKE_CFLAGS.64     = -m64 -D__MATHERR_RENAME_EXCEPTION
+CMAKE_CXXFLAGS.32   = -D__MATHERR_RENAME_EXCEPTION -template=extdef -xnorunpath
+CMAKE_CXXFLAGS.64   = -m64 -D__MATHERR_RENAME_EXCEPTION -template=extdef -xnorunpath
 
 # Providing component specific build options to cmake
 CMAKE_OPTIONS += -DBUILD_CONFIG=mysql_release
@@ -81,10 +85,11 @@
 CMAKE_OPTIONS += -DWITH_INNOBASE_STORAGE_ENGINE=1
 CMAKE_OPTIONS += -DCMAKE_CXX_COMPILER=$(CXX)
 CMAKE_OPTIONS += -DCMAKE_C_COMPILER=$(CC)
-CMAKE_OPTIONS += -DCMAKE_C_FLAGS=$(CMAKE_CFLAGS.$(BITS))
-CMAKE_OPTIONS += -DCMAKE_CXX_FLAGS=$(CMAKE_CXXFLAGS.$(BITS))
+CMAKE_OPTIONS += -DCMAKE_C_FLAGS="$(CMAKE_CFLAGS.$(BITS))"
+CMAKE_OPTIONS += -DCMAKE_CXX_FLAGS="$(CMAKE_CXXFLAGS.$(BITS))"
 CMAKE_OPTIONS += '-DCOMPILATION_COMMENT=MySQL Community Server (GPL)'
 CMAKE_OPTIONS += -DFEATURE_SET=community
+CMAKE_OPTIONS += -DSUNPRO_CXX_LIBRARY=stdcxx4
 
 COMPONENT_PRE_BUILD_ACTION += cd $(@D);
 COMPONENT_PRE_BUILD_ACTION += export LDFLAGS=$(CMAKE_CXXFLAGS.$(BITS));
@@ -99,6 +104,7 @@
 
 system-test:    $(NO_TESTS)
 
+REQUIRED_PACKAGES += database/mysql-56/client
 REQUIRED_PACKAGES += developer/build/cmake
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += runtime/perl-512
@@ -106,7 +112,7 @@
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/library
-REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime
-REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
+REQUIRED_PACKAGES += system/library/c++-runtime
 REQUIRED_PACKAGES += system/library/math
 REQUIRED_PACKAGES += system/network
+REQUIRED_PACKAGES += library/c++/stdcxx
--- a/components/mysql-5-6/mysql-56test.p5m	Fri Jul 31 02:20:49 2015 -0700
+++ b/components/mysql-5-6/mysql-56test.p5m	Fri Jul 31 05:46:44 2015 -0700
@@ -143,6 +143,7 @@
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_mixing_engines.test
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_mts_crash_safe.test
+file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_mts_execute_partial_trx_in_relay_log.inc
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_multi_query.test
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_multi_update.test
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_multi_update2.test
@@ -198,6 +199,7 @@
 file path=usr/mysql/5.6/mysql-test/include/analyze-timeout.test
 file path=usr/mysql/5.6/mysql-test/include/assert.inc
 file path=usr/mysql/5.6/mysql-test/include/assert_command_output.inc
+file path=usr/mysql/5.6/mysql-test/include/assert_grep.inc
 file path=usr/mysql/5.6/mysql-test/include/begin_include_file.inc
 file path=usr/mysql/5.6/mysql-test/include/big_test.inc
 file path=usr/mysql/5.6/mysql-test/include/binlog_inject_error.inc
@@ -282,6 +284,7 @@
 file path=usr/mysql/5.6/mysql-test/include/func_in.inc
 file path=usr/mysql/5.6/mysql-test/include/function_defaults.inc
 file path=usr/mysql/5.6/mysql-test/include/function_defaults_notembedded.inc
+file path=usr/mysql/5.6/mysql-test/include/get_file_permissions.inc
 file path=usr/mysql/5.6/mysql-test/include/get_ndb_epochs.inc
 file path=usr/mysql/5.6/mysql-test/include/get_relay_log_pos.inc
 file path=usr/mysql/5.6/mysql-test/include/gis_debug.inc
@@ -355,6 +358,7 @@
 file path=usr/mysql/5.6/mysql-test/include/have_memcached_plugin.inc
 file path=usr/mysql/5.6/mysql-test/include/have_mrr.inc
 file path=usr/mysql/5.6/mysql-test/include/have_multi_ndb.inc
+file path=usr/mysql/5.6/mysql-test/include/have_mysql_no_login_plugin.inc
 file path=usr/mysql/5.6/mysql-test/include/have_mysql_upgrade.inc
 file path=usr/mysql/5.6/mysql-test/include/have_ndb.inc
 file path=usr/mysql/5.6/mysql-test/include/have_ndb_extra.inc
@@ -390,6 +394,7 @@
 file path=usr/mysql/5.6/mysql-test/include/have_utf32.inc
 file path=usr/mysql/5.6/mysql-test/include/have_utf8.inc
 file path=usr/mysql/5.6/mysql-test/include/have_utf8mb4.inc
+file path=usr/mysql/5.6/mysql-test/include/have_util_nc.inc
 file path=usr/mysql/5.6/mysql-test/include/have_valgrind.inc
 file path=usr/mysql/5.6/mysql-test/include/have_validate_password_plugin.inc
 file path=usr/mysql/5.6/mysql-test/include/ib_logfile_size_check.inc
@@ -452,6 +457,7 @@
 file path=usr/mysql/5.6/mysql-test/include/ndb_restore_slave_eoption.inc
 file path=usr/mysql/5.6/mysql-test/include/ndb_setup_slave.inc
 file path=usr/mysql/5.6/mysql-test/include/ndb_wait_connected.inc
+file path=usr/mysql/5.6/mysql-test/include/no_protocol.inc
 file path=usr/mysql/5.6/mysql-test/include/no_running_event_scheduler.inc
 file path=usr/mysql/5.6/mysql-test/include/no_running_events.inc
 file path=usr/mysql/5.6/mysql-test/include/no_valgrind_without_big.inc
@@ -616,6 +622,7 @@
 file path=usr/mysql/5.6/mysql-test/include/wait_for_slave_sql_to_stop.inc
 file path=usr/mysql/5.6/mysql-test/include/wait_for_slave_to_start.inc
 file path=usr/mysql/5.6/mysql-test/include/wait_for_slave_to_stop.inc
+file path=usr/mysql/5.6/mysql-test/include/wait_for_slave_to_sync_with_master.inc
 file path=usr/mysql/5.6/mysql-test/include/wait_for_status_var.inc
 file path=usr/mysql/5.6/mysql-test/include/wait_innodb_all_purged.inc
 file path=usr/mysql/5.6/mysql-test/include/wait_show_condition.inc
@@ -1035,6 +1042,7 @@
 file path=usr/mysql/5.6/mysql-test/r/innodb_mysql_lock2.result
 file path=usr/mysql/5.6/mysql-test/r/innodb_mysql_sync.result
 file path=usr/mysql/5.6/mysql-test/r/innodb_pk_extension_off.result
+file path=usr/mysql/5.6/mysql-test/r/innodb_recovery_with_upper_case_names.result
 file path=usr/mysql/5.6/mysql-test/r/insert.result
 file path=usr/mysql/5.6/mysql-test/r/insert_notembedded.result
 file path=usr/mysql/5.6/mysql-test/r/insert_select.result
@@ -1077,6 +1085,7 @@
 file path=usr/mysql/5.6/mysql-test/r/lock_multi_bug38691.result
 file path=usr/mysql/5.6/mysql-test/r/lock_sync.result
 file path=usr/mysql/5.6/mysql-test/r/lock_tables_lost_commit.result
+file path=usr/mysql/5.6/mysql-test/r/log_empty_name.result
 file path=usr/mysql/5.6/mysql-test/r/log_state.result
 file path=usr/mysql/5.6/mysql-test/r/log_state_bug33693.result
 file path=usr/mysql/5.6/mysql-test/r/log_tables-big.result
@@ -1156,6 +1165,7 @@
 file path=usr/mysql/5.6/mysql-test/r/mysqladmin.result
 file path=usr/mysql/5.6/mysql-test/r/mysqlbinlog.result
 file path=usr/mysql/5.6/mysql-test/r/mysqlbinlog_debug.result
+file path=usr/mysql/5.6/mysql-test/r/mysqlbinlog_mixed_or_statment.result
 file path=usr/mysql/5.6/mysql-test/r/mysqlbinlog_raw_mode.result
 file path=usr/mysql/5.6/mysql-test/r/mysqlbinlog_raw_mode_win.result
 file path=usr/mysql/5.6/mysql-test/r/mysqlbinlog_row_big.result
@@ -1462,6 +1472,7 @@
 file path=usr/mysql/5.6/mysql-test/r/table_open_cache_functionality.result
 file path=usr/mysql/5.6/mysql-test/r/tablelock.result
 file path=usr/mysql/5.6/mysql-test/r/tablespace.result
+file path=usr/mysql/5.6/mysql-test/r/temp_pool.result
 file path=usr/mysql/5.6/mysql-test/r/temp_table.result
 file path=usr/mysql/5.6/mysql-test/r/temporal_literal.result
 file path=usr/mysql/5.6/mysql-test/r/testdb_only.require
@@ -1547,6 +1558,8 @@
 file path=usr/mysql/5.6/mysql-test/std_data/bad_gis_data.dat
 file path=usr/mysql/5.6/mysql-test/std_data/binlog_savepoint.000001
 file path=usr/mysql/5.6/mysql-test/std_data/binlog_transaction.000001
+file path=usr/mysql/5.6/mysql-test/std_data/binlog_transaction_with_GTID.000001
+file path=usr/mysql/5.6/mysql-test/std_data/binlog_transaction_with_anonymous_GTID.000001
 file path=usr/mysql/5.6/mysql-test/std_data/bug15328.cnf
 file path=usr/mysql/5.6/mysql-test/std_data/bug16266.000001
 file path=usr/mysql/5.6/mysql-test/std_data/bug17532932.MYD
@@ -1676,6 +1689,8 @@
 file path=usr/mysql/5.6/mysql-test/std_data/server-key.pem
 file path=usr/mysql/5.6/mysql-test/std_data/server8k-cert.pem
 file path=usr/mysql/5.6/mysql-test/std_data/server8k-key.pem
+file path=usr/mysql/5.6/mysql-test/std_data/slave-relay-bin_linux.index
+file path=usr/mysql/5.6/mysql-test/std_data/slave-relay-bin_win.index
 file path=usr/mysql/5.6/mysql-test/std_data/system_tap.stp
 file path=usr/mysql/5.6/mysql-test/std_data/trunc_binlog.000001
 file path=usr/mysql/5.6/mysql-test/std_data/untrusted-cacert.pem
@@ -1704,6 +1719,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/have_ssl.require
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/key_value_auth.result
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/mysql_native_plugin.result
+file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/mysql_no_login.result
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/mysql_old_passwords.result
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/mysql_old_plugin.result
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/mysql_sha256_plugin.result
@@ -1722,6 +1738,8 @@
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/key_value_auth.test
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/key_value_auth.test_old
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/mysql_native_plugin.test
+file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/mysql_no_login-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/mysql_no_login.test
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/mysql_old_passwords-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/mysql_old_passwords.test
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/mysql_old_plugin.test
@@ -1746,6 +1764,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_delete_and_flush_index.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_drop_if_exists.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_enforce_gtid_consistency.result
+file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_error_action.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_format_switch_in_tmp_table.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_grant.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_gtid_cache.result
@@ -1757,6 +1776,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_gtid_mysqlbinlog_row_myisam.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_gtid_mysqlbinlog_start_stop.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_gtid_row_ctype_ucs.result
+file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_gtid_simple_recovery.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_gtid_stm_ctype_ucs.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_gtid_utils.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_hexdump.result
@@ -1828,7 +1848,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_variables_relay_log.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_variables_relay_log_index.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_write_error.result
-file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlogging_impossible.result
+file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_xa_handling.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/std_data/binlog_old_version_4_1.000001
 file path=usr/mysql/5.6/mysql-test/suite/binlog/std_data/bug11747887-bin.000003
 file path=usr/mysql/5.6/mysql-test/suite/binlog/std_data/bug32407.001
@@ -1853,6 +1873,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_delete_and_flush_index.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_drop_if_exists.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_enforce_gtid_consistency.test
+file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_error_action.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_format_switch_in_tmp_table.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_grant.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_gtid_cache-master.opt
@@ -1866,6 +1887,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_gtid_mysqlbinlog_row_myisam.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_gtid_mysqlbinlog_start_stop.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_gtid_row_ctype_ucs.test
+file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_gtid_simple_recovery.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_gtid_stm_ctype_ucs.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_gtid_utils.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_hexdump.test
@@ -1957,7 +1979,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_variables_relay_log_index-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_variables_relay_log_index.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_write_error.test
-file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlogging_impossible.test
+file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_xa_handling.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/disabled.def
 file path=usr/mysql/5.6/mysql-test/suite/engines/README
 file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/r/ai_init_alter_table.result
@@ -3244,11 +3266,14 @@
 file path=usr/mysql/5.6/mysql-test/suite/funcs_2/t/memory_charset.test
 file path=usr/mysql/5.6/mysql-test/suite/funcs_2/t/myisam_charset.test
 file path=usr/mysql/5.6/mysql-test/suite/funcs_2/t/suite.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb/include/checksum_not_strict.inc
 file path=usr/mysql/5.6/mysql-test/suite/innodb/include/innodb_dict.inc
 file path=usr/mysql/5.6/mysql-test/suite/innodb/include/innodb_stats.inc
 file path=usr/mysql/5.6/mysql-test/suite/innodb/include/innodb_stats_table_flag.inc
 file path=usr/mysql/5.6/mysql-test/suite/innodb/include/innodb_stats_table_flag_analyze.inc
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/blob-update-debug.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb/r/blob_redo.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb/r/checksum.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/create-index.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/foreign_key.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb-2byte-collation.result
@@ -3386,7 +3411,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_information_schema_buffer.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_misc1.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_monitor.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_multi_update.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_mysql.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_mysql_rbk.result
@@ -3417,7 +3441,17 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_trx_weight.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_upd_stats_if_needed_not_inited.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_ut_format_name.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb/r/insert_debug.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb/r/monitor.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb/r/monitor_debug.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb/r/sp_temp_table.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb/r/strict_checksum.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb/r/strict_mode.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb/r/xa_recovery.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/blob-update-debug.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb/t/blob_redo-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb/t/blob_redo.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb/t/checksum.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/create-index.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/disabled.def
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/foreign_key.test
@@ -3585,7 +3619,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_misc1-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_misc1.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_monitor.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_multi_update.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_mysql-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_mysql.test
@@ -3621,8 +3654,17 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_trx_weight.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_upd_stats_if_needed_not_inited.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_ut_format_name.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb/t/insert_debug.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb/t/monitor.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb/t/monitor_debug.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/portability_wl5980_linux.zip
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/portability_wl5980_windows.zip
+file path=usr/mysql/5.6/mysql-test/suite/innodb/t/sp_temp_table.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb/t/strict_checksum.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb/t/strict_mode.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb/t/xa_recovery.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/r/fts_compatibility.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/r/fts_compatibility_win.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/r/fulltext.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/r/fulltext2.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/r/fulltext3.result
@@ -3652,7 +3694,11 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/r/innodb_fts_savepoint.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/r/innodb_fts_stopword_charset.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/r/innodb_fts_transaction.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/r/phrase.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/r/subexpr.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/t/disabled.def
+file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/t/fts_compatibility.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/t/fts_compatibility_win.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/t/fulltext.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/t/fulltext2.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/t/fulltext3.test
@@ -3683,6 +3729,107 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/t/innodb_fts_savepoint.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/t/innodb_fts_stopword_charset.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/t/innodb_fts_transaction.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/t/phrase.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/t/subexpr.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/include/innodb_stress.inc
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_bigstress.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_bigstress_blob.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_bigstress_blob_nocompress.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_bigstress_crash.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_bigstress_crash_blob.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_bigstress_crash_blob_nocompress.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_bigstress_crash_nocompress.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_bigstress_nocompress.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_hugestress.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_hugestress_blob.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_hugestress_blob_nocompress.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_hugestress_crash.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_hugestress_crash_blob.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_hugestress_crash_blob_nocompress.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_hugestress_crash_nocompress.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_hugestress_nocompress.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_stress.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_stress_blob.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_stress_blob_nocompress.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_stress_crash.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_stress_crash_blob.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_stress_crash_blob_nocompress.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_stress_crash_nocompress.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_stress_nocompress.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/Readme
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_blob-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_blob-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_blob.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_blob_nocompress-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_blob_nocompress-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_blob_nocompress.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash_blob-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash_blob-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash_blob.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash_blob_nocompress-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash_blob_nocompress-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash_blob_nocompress.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash_nocompress-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash_nocompress-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash_nocompress.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_nocompress-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_nocompress-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_nocompress.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob_nocompress-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob_nocompress-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob_nocompress.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob_nocompress-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob_nocompress-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob_nocompress.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_nocompress-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_nocompress-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_nocompress.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_nocompress-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_nocompress-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_nocompress.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_blob-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_blob-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_blob.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_blob_nocompress-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_blob_nocompress-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_blob_nocompress.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash_blob-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash_blob-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash_blob.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash_blob_nocompress-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash_blob_nocompress-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash_blob_nocompress.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash_nocompress-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash_nocompress-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash_nocompress.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_nocompress-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_nocompress-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_nocompress.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/load_generator.py
 file path=usr/mysql/5.6/mysql-test/suite/innodb_zip/include/innodb_create_tab_indx.inc
 file path=usr/mysql/5.6/mysql-test/suite/innodb_zip/include/innodb_fetch_records.inc
 file path=usr/mysql/5.6/mysql-test/suite/innodb_zip/include/innodb_load_data.inc
@@ -5083,7 +5230,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/include/have_aligned_memory.inc
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/include/hostcache_dump.inc
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/include/hostcache_set_state.inc
-file path=usr/mysql/5.6/mysql-test/suite/perfschema/include/no_protocol.inc
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/include/privilege.inc
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/include/rpl_statements_truncate.inc
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/include/schema.inc
@@ -5181,6 +5327,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/ddl_tiws_by_index_usage.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/ddl_tiws_by_table.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/ddl_users.result
+file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/digest_null_literal.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/digest_table_full.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/dml_accounts.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/dml_cond_instances.result
@@ -5339,6 +5486,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/start_server_disable_statements.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/start_server_disable_waits.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/start_server_innodb.result
+file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/start_server_low_digest.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/start_server_no_account.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/start_server_no_cond_class.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
@@ -5420,6 +5568,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/threads_insert_delayed.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/threads_mysql.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/trigger_table_io.result
+file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/unary_digest.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/view_table_io.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/aggregate.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/all_tests.test
@@ -5505,6 +5654,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/ddl_tiws_by_table.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/ddl_tlws_by_table.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/ddl_users.test
+file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/digest_null_literal.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/digest_table_full-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/digest_table_full.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/disabled.def
@@ -5717,6 +5867,8 @@
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/start_server_disable_waits.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/start_server_innodb-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/start_server_innodb.test
+file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/start_server_low_digest-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/start_server_low_digest.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/start_server_no_account-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/start_server_no_account.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/start_server_no_cond_class-master.opt
@@ -5835,6 +5987,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/threads_mysql-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/threads_mysql.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/trigger_table_io.test
+file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/unary_digest.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/view_table_io.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema_stress/README
 file path=usr/mysql/5.6/mysql-test/suite/perfschema_stress/include/settings.inc
@@ -5886,11 +6039,15 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_alter.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_alter_db.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_alter_repository.result
+file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_apply_binlog_with_anonymous_gtid.result
+file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.result
+file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_apply_binlog_with_gtid_when_gtid_mode_off.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_auto_increment.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_auto_increment_11932.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_auto_increment_bug33029.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_auto_increment_bug45679.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result
+file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_avoid_temporal_upgrade.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_binlog_corruption.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_binlog_errors.result
@@ -5941,6 +6098,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_do_table_filter_sensitive.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_drop.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_drop_db.result
+file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_drop_db_fail.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_drop_temp.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_drop_view.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_dual_pos_advance.result
@@ -5968,6 +6126,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_grant.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_grant_plugin.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_group_commit_deadlock.result
+file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_binary_log_as_relay_log.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_binlog_errors.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_do_table_filter_insensitive.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_do_table_filter_sensitive.result
@@ -5980,9 +6139,12 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_ignore_table_filter_sensitive.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_loaddata_s.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_mode.result
+file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_mode_off_new_master.result
+file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_mode_on_new_master.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_parallel.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_purged_fail_to_connect.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_purged_maintained.result
+file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_replay_relaylog.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_row_event_max_size.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_row_show_relaylog_events.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_server_sighup.result
@@ -5990,6 +6152,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_stm_insert_delayed.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_stm_mix_show_relaylog_events.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_stress_failover.result
+file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_validate_slave_gtids.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_heartbeat.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_heartbeat_2slaves.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
@@ -6036,6 +6199,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_locale.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_log_pos.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_lost_events_on_rotate.result
+file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_low_slave_net_time_out.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_many_optimize.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_master_connection.result
@@ -6052,6 +6216,9 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_mixed_row_innodb.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_mts_debug.result
+file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_off.result
+file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_on.result
+file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_mts_slave_hang_with_partial_trx.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_multi_delete.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_multi_delete2.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_multi_engine.result
@@ -6094,6 +6261,8 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_read_old_relay_log_info.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_read_only.result
+file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_recovery_empty_sqlthd_pos.result
+file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_recovery_replicate_same_server_id.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_relay_space_innodb.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_relay_space_myisam.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_relayrotate.result
@@ -6199,6 +6368,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_row_view01.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_row_wide_table.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_savepoint.result
+file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_sbm_previous_gtid_event.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_seconds_behind_master.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_semi_sync.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_semi_sync_deadlock.result
@@ -6219,6 +6389,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_show_master_info_file.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_show_slave_hosts.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_show_slave_running.result
+file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_show_slave_status_deadlock.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_skip_ddl_errors_cli.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_skip_error.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_skip_incident.result
@@ -6234,7 +6405,9 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_sp.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_sp004.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_sp_effects.result
+file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_sp_privileges.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_spec_variables.result
+file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_special_charset.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_sporadic_master.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_ssl.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_ssl1.result
@@ -6290,6 +6463,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_typeconv.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_typeconv_innodb.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_udf.result
+file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_unknown_ignorable_event.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_user.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_user_variables.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_variables.result
@@ -6310,12 +6484,16 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_alter.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_alter_db.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_alter_repository.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_apply_binlog_with_anonymous_gtid.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_apply_binlog_with_gtid_when_gtid_mode_off.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_auto_increment-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_auto_increment.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_auto_increment_11932.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_auto_increment_bug33029.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_auto_increment_bug45679.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_auto_increment_update_failure.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_avoid_temporal_upgrade.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_begin_commit_rollback-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_begin_commit_rollback-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test
@@ -6389,6 +6567,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_do_table_filter_sensitive.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_drop.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_drop_db.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_drop_db_fail.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_drop_temp-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_drop_temp.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_drop_view.test
@@ -6431,6 +6610,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_grant_plugin-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_grant_plugin.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_group_commit_deadlock.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_binary_log_as_relay_log.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_binlog_errors-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_binlog_errors.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_do_table_filter_insensitive-master.opt
@@ -6459,11 +6639,14 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_loaddata_s-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_loaddata_s.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_mode.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_mode_off_new_master.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_mode_on_new_master.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_parallel.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_purged_fail_to_connect-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_purged_fail_to_connect-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_purged_fail_to_connect.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_purged_maintained.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_replay_relaylog.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_row_event_max_size-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_row_event_max_size-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_row_event_max_size.test
@@ -6474,6 +6657,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_stm_mix_show_relaylog_events.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_stress_failover.cnf
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_stress_failover.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_validate_slave_gtids.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_heartbeat-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_heartbeat.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.cnf
@@ -6559,6 +6743,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_locale.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_log_pos.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_low_slave_net_time_out.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_manual_change_index_file.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_many_optimize.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_master_connection-master.opt
@@ -6582,6 +6767,12 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mixed_row_innodb-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mts_debug-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mts_debug.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_off-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_off.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_on-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_on.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_multi_delete-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_multi_delete.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_multi_delete2-slave.opt
@@ -6647,6 +6838,10 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_read_old_relay_log_info.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_read_only.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_recovery_empty_sqlthd_pos-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_recovery_empty_sqlthd_pos.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_recovery_replicate_same_server_id-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_recovery_replicate_same_server_id.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_relay_space_innodb.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_relay_space_myisam.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt
@@ -6790,6 +6985,8 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_row_view01.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_row_wide_table.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_savepoint.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_sbm_previous_gtid_event-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_sbm_previous_gtid_event.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_seconds_behind_master.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_semi_sync-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_semi_sync-slave.opt
@@ -6831,6 +7028,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_show_slave_hosts.cnf
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_show_slave_hosts.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_show_slave_running.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_show_slave_status_deadlock.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_skip_ddl_errors_cli-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_skip_ddl_errors_cli.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_skip_error-slave.opt
@@ -6858,8 +7056,12 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_sp_effects-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_sp_effects-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_sp_effects.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_sp_privileges.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_spec_variables-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_spec_variables.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_special_charset-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_special_charset-slave.opt
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_special_charset.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_sporadic_master-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_sporadic_master.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_ssl.test
@@ -6939,6 +7141,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_udf-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_udf-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_udf.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_unknown_ignorable_event.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_user.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_user_variables.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_variables.test
@@ -7049,8 +7252,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/inc/range_alloc_block_size_basic.inc
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/inc/slave_transaction_retries_basic.inc
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/all_vars.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/auto_increment_increment_func.result
@@ -7064,6 +7265,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/autocommit_func5.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/automatic_sp_privileges_func.result
+file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/avoid_temporal_upgrade_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/back_log_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/basedir_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/big_tables_basic.result
@@ -7072,7 +7274,9 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/binlog_checksum_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/binlog_direct_non_transactional_updates_basic.result
+file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/binlog_error_action_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/binlog_format_basic.result
+file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/binlog_gtid_simple_recovery_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/binlog_max_flush_queue_time_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/binlog_order_commits_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/binlog_row_image_basic.result
@@ -7369,6 +7573,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/max_connections_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result
+file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/max_digest_length_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/max_error_count_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/max_heap_table_size_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result
@@ -7531,6 +7736,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/sha256_password_public_key_path_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/shared_memory_base_name_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/shared_memory_basic.result
+file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/show_old_temporals_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/skip_external_locking_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/skip_name_resolve_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/skip_networking_basic.result
@@ -7613,11 +7819,9 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/timestamp_sysdate_is_now_func.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/tmp_table_size_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/tmpdir_basic.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result
+file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/transaction_allow_batching_basic.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result
+file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/tx_isolation_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/tx_isolation_func.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/tx_read_only_basic.result
@@ -7649,6 +7853,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/autocommit_func5.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/automatic_sp_privileges_func.test
+file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/avoid_temporal_upgrade_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/back_log_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/basedir_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/big_tables_basic.test
@@ -7657,7 +7862,9 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_64.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/binlog_checksum_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/binlog_direct_non_transactional_updates_basic.test
+file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/binlog_error_action_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/binlog_format_basic.test
+file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/binlog_gtid_simple_recovery_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/binlog_max_flush_queue_time_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/binlog_order_commits_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/binlog_row_image_basic.test
@@ -7936,6 +8143,8 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/max_binlog_size_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/max_binlog_stmt_cache_size_basic.test
+file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/max_digest_length_basic-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/max_digest_length_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/max_error_count_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/max_heap_table_size_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/max_insert_delayed_threads_basic.test
@@ -8146,6 +8355,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/sha256_password_public_key_path_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/shared_memory_basic.test
+file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/show_old_temporals_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/skip_external_locking_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/skip_name_resolve_basic-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/skip_name_resolve_basic.test
@@ -8236,6 +8446,8 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/timestamp_sysdate_is_now_func.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/tmp_table_size_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/tmpdir_basic.test
+file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic.test
+file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic.test
 file path=usr/mysql/5.6/mysql-test/t/archive_gis.test
 file path=usr/mysql/5.6/mysql-test/t/archive_no_symlink-master.opt
 file path=usr/mysql/5.6/mysql-test/t/archive_no_symlink.test
@@ -8563,6 +8775,8 @@
 file path=usr/mysql/5.6/mysql-test/t/innodb_mysql_sync.test
 file path=usr/mysql/5.6/mysql-test/t/innodb_pk_extension_off.test
 file path=usr/mysql/5.6/mysql-test/t/innodb_pk_extension_on.test
+file path=usr/mysql/5.6/mysql-test/t/innodb_recovery_with_upper_case_names-master.opt
+file path=usr/mysql/5.6/mysql-test/t/innodb_recovery_with_upper_case_names.test
 file path=usr/mysql/5.6/mysql-test/t/insert.test
 file path=usr/mysql/5.6/mysql-test/t/insert_notembedded.test
 file path=usr/mysql/5.6/mysql-test/t/insert_select.test
@@ -8602,6 +8816,8 @@
 file path=usr/mysql/5.6/mysql-test/t/lock_sync.test
 file path=usr/mysql/5.6/mysql-test/t/lock_tables_lost_commit-master.opt
 file path=usr/mysql/5.6/mysql-test/t/lock_tables_lost_commit.test
+file path=usr/mysql/5.6/mysql-test/t/log_empty_name.opt
+file path=usr/mysql/5.6/mysql-test/t/log_empty_name.test
 file path=usr/mysql/5.6/mysql-test/t/log_state-master.opt
 file path=usr/mysql/5.6/mysql-test/t/log_state.test
 file path=usr/mysql/5.6/mysql-test/t/log_state_bug33693-master.opt
@@ -8717,6 +8933,7 @@
 file path=usr/mysql/5.6/mysql-test/t/mysqlbinlog-master.opt
 file path=usr/mysql/5.6/mysql-test/t/mysqlbinlog.test
 file path=usr/mysql/5.6/mysql-test/t/mysqlbinlog_debug.test
+file path=usr/mysql/5.6/mysql-test/t/mysqlbinlog_mixed_or_statment.test
 file path=usr/mysql/5.6/mysql-test/t/mysqlbinlog_raw_mode.test
 file path=usr/mysql/5.6/mysql-test/t/mysqlbinlog_raw_mode_win.test
 file path=usr/mysql/5.6/mysql-test/t/mysqlbinlog_row_big.test
@@ -9069,6 +9286,8 @@
 file path=usr/mysql/5.6/mysql-test/t/table_open_cache_functionality.test
 file path=usr/mysql/5.6/mysql-test/t/tablelock.test
 file path=usr/mysql/5.6/mysql-test/t/tablespace.test
+file path=usr/mysql/5.6/mysql-test/t/temp_pool-master.opt
+file path=usr/mysql/5.6/mysql-test/t/temp_pool.test
 file path=usr/mysql/5.6/mysql-test/t/temp_table-master.opt
 file path=usr/mysql/5.6/mysql-test/t/temp_table.test
 file path=usr/mysql/5.6/mysql-test/t/temporal_literal.test
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mysql-5-6/patches/bug21185883.patch	Fri Jul 31 05:46:44 2015 -0700
@@ -0,0 +1,236 @@
+Developed in-house, not fed back.
+Solaris-specific: SolarisStudio Customization.
+=== modified file 'CMakeLists.txt'
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
[email protected]@ -1,4 +1,4 @@
+-# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ # 
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
[email protected]@ -19,6 +19,11 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.6)
+  CMAKE_POLICY(VERSION 2.8)
+ endif()
+ 
++# We use CMAKE_SHARED_LIBRARY_<Lang>_FLAGS. See cmake --help-policy CMP0018
++IF(CMAKE_VERSION VERSION_GREATER "2.8.8")
++  CMAKE_POLICY(SET CMP0018 OLD)
++ENDIF()
++
+ # We use PROPERTIES LINK_INTERFACE_LIBRARIES. See cmake --help-policy CMP0022
+ IF(CMAKE_VERSION VERSION_EQUAL "2.8.12" OR
+    CMAKE_VERSION VERSION_GREATER "2.8.12")
+=== modified file 'cmake/plugin.cmake'
+--- a/cmake/plugin.cmake
++++ b/cmake/plugin.cmake
[email protected]@ -1,4 +1,4 @@
+-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ # 
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
[email protected]@ -175,6 +175,15 @@ MACRO(MYSQL_ADD_PLUGIN)
+       COMPILE_DEFINITIONS "MYSQL_DYNAMIC_PLUGIN")
+     TARGET_LINK_LIBRARIES (${target} mysqlservices)
+ 
++    GET_TARGET_PROPERTY(LINK_FLAGS ${target} LINK_FLAGS)
++    IF(NOT LINK_FLAGS)
++      # Avoid LINK_FLAGS-NOTFOUND
++      SET(LINK_FLAGS)
++    ENDIF()
++    SET_TARGET_PROPERTIES(${target} PROPERTIES
++      LINK_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${LINK_FLAGS} "
++    )
++
+     # Plugin uses symbols defined in mysqld executable.
+     # Some operating systems like Windows and OSX and are pretty strict about 
+     # unresolved symbols. Others are less strict and allow unresolved symbols
+=== modified file 'configure.cmake'
+--- a/configure.cmake
++++ b/configure.cmake
[email protected]@ -1,4 +1,4 @@
+-# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ # 
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
[email protected]@ -43,6 +43,13 @@ IF(UNIX)
+ ENDIF()
+ 
+ 
++IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX)
++  ## We will be using gcc to generate .so files
++  ## Add C flags (e.g. -m64) to CMAKE_SHARED_LIBRARY_C_FLAGS
++  SET(CMAKE_SHARED_LIBRARY_C_FLAGS
++    "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS}")
++ENDIF()
++
+ 
+ # System type affects version_compile_os variable 
+ IF(NOT SYSTEM_TYPE)
[email protected]@ -65,6 +72,10 @@ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
+   IF(CMAKE_CXX_COMPILER_ID MATCHES "SunPro")
+     IF(SUNPRO_CXX_LIBRARY)
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=${SUNPRO_CXX_LIBRARY}")
++      IF(SUNPRO_CXX_LIBRARY STREQUAL "stdcxx4")
++        ADD_DEFINITIONS(-D__MATHERR_RENAME_EXCEPTION)
++        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -template=extdef")
++      ENDIF()
+     ELSE()
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=stlport4")
+     ENDIF()
[email protected]@ -88,45 +99,109 @@ MACRO(DIRNAME IN OUT)
+   GET_FILENAME_COMPONENT(${OUT} ${IN} PATH)
+ ENDMACRO()
+ 
++MACRO(FIND_REAL_LIBRARY SOFTLINK_NAME REALNAME)
++  # We re-distribute libstlport.so/libstdc++.so which are both symlinks.
++  # There is no 'readlink' on solaris, so we use perl to follow links:
++  SET(PERLSCRIPT
++    "my $link= $ARGV[0]; use Cwd qw(abs_path); my $file = abs_path($link); print $file;")
++  EXECUTE_PROCESS(
++    COMMAND perl -e "${PERLSCRIPT}" ${SOFTLINK_NAME}
++    RESULT_VARIABLE result
++    OUTPUT_VARIABLE real_library
++    )
++  SET(REALNAME ${real_library})
++ENDMACRO()
++
++MACRO(EXTEND_CXX_LINK_FLAGS LIBRARY_PATH)
++  # Using the $ORIGIN token with the -R option to locate the libraries
++  # on a path relative to the executable:
++  # We need an extra backslash to pass $ORIGIN to the mysql_config script...
++  SET(QUOTED_CMAKE_CXX_LINK_FLAGS
++    "${CMAKE_CXX_LINK_FLAGS} -R'\\$ORIGIN/../lib' -R${LIBRARY_PATH}")
++  SET(CMAKE_CXX_LINK_FLAGS
++    "${CMAKE_CXX_LINK_FLAGS} -R'\$ORIGIN/../lib' -R${LIBRARY_PATH}")
++  MESSAGE(STATUS "CMAKE_CXX_LINK_FLAGS ${CMAKE_CXX_LINK_FLAGS}")
++ENDMACRO()
++
++MACRO(EXTEND_C_LINK_FLAGS LIBRARY_PATH)
++  SET(QUOTED_CMAKE_C_LINK_FLAGS
++    "${CMAKE_C_LINK_FLAGS} -R'\\$ORIGIN/../lib' -R${LIBRARY_PATH}")
++  SET(CMAKE_C_LINK_FLAGS
++    "${CMAKE_C_LINK_FLAGS} -R'\$ORIGIN/../lib' -R${LIBRARY_PATH}")
++  MESSAGE(STATUS "CMAKE_C_LINK_FLAGS ${CMAKE_C_LINK_FLAGS}")
++  SET(CMAKE_SHARED_LIBRARY_C_FLAGS
++    "${CMAKE_SHARED_LIBRARY_C_FLAGS} -R'\$ORIGIN/..' -R'\$ORIGIN/../lib' -R${LIBRARY_PATH}")
++ENDMACRO()
++
+ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND
+    CMAKE_C_COMPILER_ID MATCHES "SunPro" AND
+    CMAKE_CXX_FLAGS MATCHES "stlport4")
+   DIRNAME(${CMAKE_CXX_COMPILER} CXX_PATH)
+-  SET(STLPORT_SUFFIX "lib/stlport4")
+-  IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
+-    SET(STLPORT_SUFFIX "lib/stlport4/v9")
++  # Also extract real path to the compiler(which is normally
++  # in <install_path>/prod/bin) and try to find the
++  # stlport libs relative to that location as well.
++  GET_FILENAME_COMPONENT(CXX_REALPATH ${CMAKE_CXX_COMPILER} REALPATH)
++
++  # CC -V yields
++  # CC: Sun C++ 5.13 SunOS_sparc Beta 2014/03/11
++  # CC: Sun C++ 5.11 SunOS_sparc 2010/08/13
++
++  EXECUTE_PROCESS(
++    COMMAND ${CMAKE_CXX_COMPILER} "-V"
++    OUTPUT_VARIABLE stdout
++    ERROR_VARIABLE  stderr
++    RESULT_VARIABLE result
++  )
++  IF(result)
++    MESSAGE(FATAL_ERROR "Failed to execute ${CMAKE_CXX_COMPILER} -V")
+   ENDIF()
+-  IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
+-    SET(STLPORT_SUFFIX "lib/stlport4/amd64")
++
++  STRING(REGEX MATCH "CC: Sun C\\+\\+ 5\\.([0-9]+)" VERSION_STRING ${stderr})
++  SET(CC_MINOR_VERSION ${CMAKE_MATCH_1})
++
++  IF(${CC_MINOR_VERSION} EQUAL 13)
++    SET(STLPORT_SUFFIX "lib/compilers/stlport4")
++    IF(SIZEOF_VOIDP EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
++      SET(STLPORT_SUFFIX "lib/compilers/stlport4/sparcv9")
++    ENDIF()
++    IF(SIZEOF_VOIDP EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
++      SET(STLPORT_SUFFIX "lib/compilers/stlport4/amd64")
++    ENDIF()
++  ELSE()
++    SET(STLPORT_SUFFIX "lib/stlport4")
++    IF(SIZEOF_VOIDP EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
++      SET(STLPORT_SUFFIX "lib/stlport4/v9")
++    ENDIF()
++    IF(SIZEOF_VOIDP EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
++      SET(STLPORT_SUFFIX "lib/stlport4/amd64")
++    ENDIF()
+   ENDIF()
+ 
+   FIND_LIBRARY(STL_LIBRARY_NAME
+     NAMES "stlport"
+     PATHS ${CXX_PATH}/../${STLPORT_SUFFIX}
++          ${CXX_REALPATH}/../../${STLPORT_SUFFIX}
+   )
+   MESSAGE(STATUS "STL_LIBRARY_NAME ${STL_LIBRARY_NAME}")
+   IF(STL_LIBRARY_NAME)
+     DIRNAME(${STL_LIBRARY_NAME} STLPORT_PATH)
+-    # We re-distribute libstlport.so which is a symlink to libstlport.so.1
+-    # There is no 'readlink' on solaris, so we use perl to follow links:
+-    SET(PERLSCRIPT
+-      "my $link= $ARGV[0]; use Cwd qw(abs_path); my $file = abs_path($link); print $file;")
+-    EXECUTE_PROCESS(
+-      COMMAND perl -e "${PERLSCRIPT}" ${STL_LIBRARY_NAME}
+-      RESULT_VARIABLE result
+-      OUTPUT_VARIABLE real_library
+-    )
++    FIND_REAL_LIBRARY(${STL_LIBRARY_NAME} real_library)
+     MESSAGE(STATUS "INSTALL ${STL_LIBRARY_NAME} ${real_library}")
+     INSTALL(FILES ${STL_LIBRARY_NAME} ${real_library}
+-            DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
+-    # Using the $ORIGIN token with the -R option to locate the libraries
+-    # on a path relative to the executable:
+-    # We need an extra backslash to pass $ORIGIN to the mysql_config script...
+-    SET(QUOTED_CMAKE_CXX_LINK_FLAGS
+-      "${CMAKE_CXX_LINK_FLAGS} -R'\\$ORIGIN/../lib' -R${STLPORT_PATH}")
+-    SET(CMAKE_CXX_LINK_FLAGS
+-      "${CMAKE_CXX_LINK_FLAGS} -R'\$ORIGIN/../lib' -R${STLPORT_PATH}")
+-    MESSAGE(STATUS "CMAKE_CXX_LINK_FLAGS ${CMAKE_CXX_LINK_FLAGS}")
++            DESTINATION ${INSTALL_LIBDIR} COMPONENT SharedLibraries)
++    EXTEND_C_LINK_FLAGS(${STLPORT_PATH})
++    EXTEND_CXX_LINK_FLAGS(${STLPORT_PATH})
++  ELSE()
++    MESSAGE(STATUS "Failed to find the required stlport library, print some"
++                   "variables to help debugging and bail out")
++    MESSAGE(STATUS "CMAKE_CXX_COMPILER ${CMAKE_CXX_COMPILER}")
++    MESSAGE(STATUS "CXX_PATH ${CXX_PATH}")
++    MESSAGE(STATUS "CXX_REALPATH ${CXX_REALPATH}")
++    MESSAGE(STATUS "STLPORT_SUFFIX ${STLPORT_SUFFIX}")
++    MESSAGE(STATUS "PATH: ${CXX_PATH}/../${STLPORT_SUFFIX}")
++    MESSAGE(STATUS "PATH: ${CXX_REALPATH}/../../${STLPORT_SUFFIX}")
++    MESSAGE(FATAL_ERROR
++      "Could not find the required stlport library.")
+   ENDIF()
+ ENDIF()
+=== modified file 'plugin/password_validation/validate_password.cc'
+--- a/plugin/password_validation/validate_password.cc
++++ b/plugin/password_validation/validate_password.cc
[email protected]@ -17,6 +17,7 @@
+ #include <string>
+ #include <mysql/plugin_validate_password.h>
+ #include <set>
++#include <ios>       // std::streamoff
+ #include <iostream>
+ #include <fstream>
+ 
+=== modified file 'unittest/gunit/CMakeLists.txt'
+--- a/unittest/gunit/CMakeLists.txt
++++ b/unittest/gunit/CMakeLists.txt
[email protected]@ -255,7 +255,6 @@ SET(TESTS
+   sql_list
+   sql_plist
+   sql_string
+-  stdcxx
+   strtoll
+   thread_utils
+   )