cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 5.1.58

Browse Source 
help and ok Brad (Maintainer)
This commit is contained in:
giovanni 2011-09-05 07:11:23 +00:00
parent ee67799759
commit d6ea53e8e0
13 changed files with 160 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
databases/mysql/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.193 2011/06/22 07:28:17 sthen Exp $
# $OpenBSD: Makefile,v 1.194 2011/09/05 07:11:23 giovanni Exp $
SHARED_ONLY= Yes
@ -6,12 +6,10 @@ COMMENT-main= multithreaded SQL database (client)
COMMENT-server= multithreaded SQL database (server)
COMMENT-tests= multithreaded SQL database (regression test suite/benchmark)
VERSION= 5.1.54
VERSION= 5.1.58
DISTNAME= mysql-${VERSION}
PKGNAME-main= mysql-client-${VERSION}
REVISION-main= 0
PKGNAME-server= mysql-server-${VERSION}
REVISION-server=9
PKGNAME-tests= mysql-tests-${VERSION}
CATEGORIES= databases
V= MySQL-5.1
@ -35,8 +33,10 @@ DB_DIR?= /var/mysql
SOCKET_DIR= /var/run/mysql
SUBST_VARS= DB_DIR SOCKET_DIR VERSION
.include <bsd.own.mk>
# XXX gcc bug, gcc/3.3.5
.if ${MACHINE_ARCH} == "alpha"
.if ${MACHINE_ARCH} == "alpha" && ${COMPILER_VERSION} != "gcc4"
CFLAGS+= -mbwx
.endif
@ -64,8 +64,6 @@ CONFIGURE_ARGS+= --localstatedir="${DB_DIR}" \
--without-docs \
--without-readline
.include <bsd.own.mk>
.if ${COMPILER_VERSION:L:Mgcc[34]}
CONFIGURE_ARGS+= --with-client-ldflags=-lsupc++ \
--with-mysqld-ldflags=-lsupc++
@ -81,7 +79,7 @@ RUN_DEPENDS-server= ${BASE_PKGPATH}>=5.1,<5.2 \
databases/p5-DBD-mysql
LIB_DEPENDS-server= ${BASE_PKGPATH}>=5.1,<5.2
WANTLIB-server= ${WANTLIB} crypto mysqlclient ssl stdc++ wrap z
WANTLIB-server= ${WANTLIB} crypto mysqlclient ssl wrap z
WANTLIB-main= ${WANTLIB} crypto ncursesw readline ssl z
WANTLIB-tests= ${WANTLIB}

10
databases/mysql/distinfo
View File

@ -1,5 +1,5 @@
MD5 (mysql-5.1.54.tar.gz) = Kg9Fovi1oEO5XOdXV5ajCw==
RMD160 (mysql-5.1.54.tar.gz) = +SUsmmIni0puF9R7yQG+NzLDKxg=
SHA1 (mysql-5.1.54.tar.gz) = w9H7fBmFUp59zcaJrHl3z/8AfJw=
SHA256 (mysql-5.1.54.tar.gz) = hDcP/8T+J3ZF+zpQQNFT/1Z1drZk8GY0Ur4HeCa3qx8=
SIZE (mysql-5.1.54.tar.gz) = 23672236
MD5 (mysql-5.1.58.tar.gz) = rlrvUGCI5SHkscxPZo6W0g==
RMD160 (mysql-5.1.58.tar.gz) = GZcpxwHHZM0iWEwrlSIwwH0PMaY=
SHA1 (mysql-5.1.58.tar.gz) = z9cL7getmVdu7N4BeFt7KnTsh6s=
SHA256 (mysql-5.1.58.tar.gz) = PGlWI5llX8YtFCRDfm71nvfB7SJflA+BVY9Um4A/P9c=
SIZE (mysql-5.1.58.tar.gz) = 24333490

22
databases/mysql/patches/patch-configure_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.33 2011/01/11 11:03:03 ajacoutot Exp $
--- configure.in.orig Mon Nov 29 05:38:01 2010
+++ configure.in Fri Jan 7 19:15:03 2011
$OpenBSD: patch-configure_in,v 1.34 2011/09/05 07:11:23 giovanni Exp $
--- configure.in.orig Fri Jul 1 11:22:18 2011
+++ configure.in Thu Aug 25 21:46:08 2011
@@ -464,44 +464,7 @@ AC_SUBST(ABI_CHECK)
AC_PATH_PROG(PS, ps, ps)
AC_MSG_CHECKING("how to check if pid exists")
@ -57,19 +57,3 @@ $OpenBSD: patch-configure_in,v 1.33 2011/01/11 11:03:03 ajacoutot Exp $
int allow_severity = 0;
int deny_severity = 0;
@@ -1884,6 +1848,15 @@ dnl
MYSQL_CHECK_TIME_T
+dnl
+dnl check size of time_t
+dnl
+
+AC_CHECK_SIZEOF(time_t, 8)
+if test "$ac_cv_sizeof_time_t" -eq 0
+then
+ AC_MSG_ERROR("MySQL needs a time_t type.")
+fi
# do we need #pragma interface/#pragma implementation ?
# yes if it's gcc 2.x, and not icc pretending to be gcc, and not cygwin

21
databases/mysql/patches/patch-include_my_time_h
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-include_my_time_h,v 1.1 2011/01/11 11:03:03 ajacoutot Exp $
--- include/my_time.h.orig Fri Jan 7 19:15:25 2011
+++ include/my_time.h Fri Jan 7 19:16:04 2011
@@ -43,6 +43,17 @@ typedef long my_time_t;
#define MY_TIME_T_MAX LONG_MAX
#define MY_TIME_T_MIN LONG_MIN
+/*
+ check for valid times only if the range of time_t is greater than
+ the range of my_time_t
+*/
+#if SIZEOF_TIME_T > SIZEOF_LONG
+# define IS_VALID_TIME_T(x) ((x) <= (time_t) MY_TIME_T_MAX && \
+ (x) >= (time_t) MY_TIME_T_MIN)
+#else
+# define IS_VALID_TIME_T(x) (1 > 0)
+#endif
+
/* Time handling defaults */
#define TIMESTAMP_MAX_YEAR 2038
#define TIMESTAMP_MIN_YEAR (1900 + YY_PART_YEAR - 1)

8
databases/mysql/patches/patch-mysql-test_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mysql-test_Makefile_in,v 1.25 2010/12/26 08:23:17 ajacoutot Exp $
--- mysql-test/Makefile.in.orig Mon Nov 29 05:42:29 2010
+++ mysql-test/Makefile.in Tue Dec 14 20:38:01 2010
@@ -400,7 +400,7 @@ yassl_libs = @yassl_libs@
$OpenBSD: patch-mysql-test_Makefile_in,v 1.26 2011/09/05 07:11:23 giovanni Exp $
--- mysql-test/Makefile.in.orig Tue Apr 12 14:14:51 2011
+++ mysql-test/Makefile.in Thu Jun 30 10:57:33 2011
@@ -399,7 +399,7 @@ yassl_libs = @yassl_libs@
yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
yassl_thread_cxxflags = @yassl_thread_cxxflags@
zlib_dir = @zlib_dir@

21
databases/mysql/patches/patch-mysql-test_r_func_time_result
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-mysql-test_r_func_time_result,v 1.1 2011/01/11 11:03:03 ajacoutot Exp $
--- mysql-test/r/func_time.result.orig Fri Jan 7 19:17:01 2011
+++ mysql-test/r/func_time.result Fri Jan 7 19:18:34 2011
@@ -1301,6 +1301,17 @@ SELECT '2008-02-18' + INTERVAL 1 FRAC_SECOND;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FRAC_SECOND' at line 1
SELECT '2008-02-18' - INTERVAL 1 FRAC_SECOND;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FRAC_SECOND' at line 1
+#
+# Bug #52315 part 2 : utc_date() crashes when system time > year 2037
+#
+SET TIMESTAMP=-147490000;
+SELECT UTC_TIMESTAMP();
+SET TIMESTAMP=2147483648;
+SELECT UTC_TIMESTAMP();
+SET TIMESTAMP=2147483646;
+SELECT UTC_TIMESTAMP();
+SET TIMESTAMP=2147483647;
+SELECT UTC_TIMESTAMP();
End of 5.0 tests
select date_sub("0050-01-01 00:00:01",INTERVAL 2 SECOND);
date_sub("0050-01-01 00:00:01",INTERVAL 2 SECOND)

25
databases/mysql/patches/patch-mysql-test_t_func_time_test
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-mysql-test_t_func_time_test,v 1.1 2011/01/11 11:03:03 ajacoutot Exp $
--- mysql-test/t/func_time.test.orig Fri Jan 7 19:18:57 2011
+++ mysql-test/t/func_time.test Fri Jan 7 19:20:19 2011
@@ -819,6 +819,21 @@ SELECT '2008-02-18' + INTERVAL 1 FRAC_SECOND;
--error ER_PARSE_ERROR
SELECT '2008-02-18' - INTERVAL 1 FRAC_SECOND;
+
+--echo #
+--echo # Bug #52315 part 2 : utc_date() crashes when system time > year 2037
+--echo #
+
+--disable_result_log
+--error ER_UNKNOWN_ERROR
+SET TIMESTAMP=-147490000; SELECT UTC_TIMESTAMP();
+--error ER_UNKNOWN_ERROR
+SET TIMESTAMP=2147483648; SELECT UTC_TIMESTAMP();
+SET TIMESTAMP=2147483646; SELECT UTC_TIMESTAMP();
+SET TIMESTAMP=2147483647; SELECT UTC_TIMESTAMP();
+--enable_result_log
+
+
--echo End of 5.0 tests
#

22
databases/mysql/patches/patch-sql-common_my_time_c
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-sql-common_my_time_c,v 1.1 2011/01/11 11:03:03 ajacoutot Exp $
--- sql-common/my_time.c.orig Mon Nov 29 05:38:13 2010
+++ sql-common/my_time.c Fri Jan 7 19:47:56 2011
@@ -991,8 +991,17 @@ my_system_gmt_sec(const MYSQL_TIME *t_src, long *my_ti
So, tmp < TIMESTAMP_MIN_VALUE will be triggered. On platfroms
with unsigned time_t tmp+= shift*86400L might result in a number,
larger then TIMESTAMP_MAX_VALUE, so another check will work.
+
+ tmp being larger than TIMESTAMP_MAX_VALUE can only happen on
+ platforms where the size of time_t is larger than the size of
+ TIMESTAMP_MAX_VALUE (currently INT32 : 4 bytes).
+ #ifdef to avoid the compilation warnings on these platforms (OpenBSD).
*/
- if ((tmp < TIMESTAMP_MIN_VALUE) || (tmp > TIMESTAMP_MAX_VALUE))
+ if ((tmp < TIMESTAMP_MIN_VALUE)
+#if SIZEOF_TIME_T > 4
+ || (tmp > TIMESTAMP_MAX_VALUE)
+#endif
+ )
tmp= 0;
return (my_time_t) tmp;

36
databases/mysql/patches/patch-sql_mysqld_cc
View File

@ -1,35 +1,7 @@
$OpenBSD: patch-sql_mysqld_cc,v 1.24 2011/01/11 11:03:03 ajacoutot Exp $
--- sql/mysqld.cc.orig Mon Nov 29 05:38:01 2010
+++ sql/mysqld.cc Fri Jan 7 19:25:15 2011
@@ -3234,13 +3234,6 @@ static int init_common_variables(const char *conf_file
max_system_variables.pseudo_thread_id= (ulong)~0;
server_start_time= flush_status_time= my_time(0);
- /* TODO: remove this when my_time_t is 64 bit compatible */
- if (server_start_time >= (time_t) MY_TIME_T_MAX)
- {
- sql_print_error("This MySQL server doesn't support dates later then 2038");
- return 1;
- }
-
rpl_filter= new Rpl_filter;
binlog_filter= new Rpl_filter;
if (!rpl_filter || !binlog_filter)
@@ -3278,6 +3271,13 @@ static int init_common_variables(const char *conf_file
*/
mysql_bin_log.init_pthread_objects();
+ /* TODO: remove this when my_time_t is 64 bit compatible */
+ if (!IS_VALID_TIME_T(server_start_time))
+ {
+ sql_print_error("This MySQL server doesn't support dates later then 2038");
+ return 1;
+ }
+
if (gethostname(glob_hostname,sizeof(glob_hostname)) < 0)
{
strmake(glob_hostname, STRING_WITH_LEN("localhost"));
@@ -4412,7 +4412,7 @@ int main(int argc, char **argv)
$OpenBSD: patch-sql_mysqld_cc,v 1.25 2011/09/05 07:11:23 giovanni Exp $
--- sql/mysqld.cc.orig Fri Jul 1 11:22:19 2011
+++ sql/mysqld.cc Thu Aug 25 21:45:52 2011
@@ -4449,7 +4449,7 @@ int main(int argc, char **argv)
select_thread_in_use=1;
#ifdef HAVE_LIBWRAP

16
databases/mysql/patches/patch-sql_set_var_cc
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-sql_set_var_cc,v 1.2 2011/01/11 11:03:03 ajacoutot Exp $
--- sql/set_var.cc.orig Mon Nov 29 05:37:59 2010
+++ sql/set_var.cc Fri Jan 7 20:05:58 2011
@@ -2718,7 +2718,11 @@ bool sys_var_timestamp::check(THD *thd, set_var *var)
time_t val;
var->save_result.ulonglong_value= var->value->val_int();
val= (time_t) var->save_result.ulonglong_value;
- if (val < (time_t) MY_TIME_T_MIN || val > (time_t) MY_TIME_T_MAX)
+ if ((val < TIMESTAMP_MIN_VALUE)
+#if SIZEOF_TIME_T > 4
+ || (val > TIMESTAMP_MAX_VALUE)
+#endif
+ )
{
my_message(ER_UNKNOWN_ERROR,
"This version of MySQL doesn't support dates later than 2038",

12
databases/mysql/patches/patch-sql_sql_class_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-sql_sql_class_h,v 1.2 2011/01/11 11:03:03 ajacoutot Exp $
--- sql/sql_class.h.orig Mon Nov 29 05:37:59 2010
+++ sql/sql_class.h Fri Jan 7 19:29:22 2011
@@ -2036,7 +2036,7 @@ class THD :public Statement, (public)
/*TODO: this will be obsolete when we have support for 64 bit my_time_t */
inline bool is_valid_time()
{
- return (start_time < (time_t) MY_TIME_T_MAX);
+ return (IS_VALID_TIME_T(start_time));
}
void set_time_after_lock() { utime_after_lock= my_micro_time(); }
ulonglong current_utime() { return my_micro_time(); }

8
databases/mysql/patches/patch-sql_sql_parse_cc
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-sql_sql_parse_cc,v 1.9 2011/05/19 08:35:15 dcoppa Exp $
$OpenBSD: patch-sql_sql_parse_cc,v 1.10 2011/09/05 07:11:23 giovanni Exp $
Fix floating point string printing in MySQL status output
(MySQL Bug #61205)
--- sql/sql_parse.cc.orig Wed May 18 12:36:24 2011
+++ sql/sql_parse.cc Wed May 18 12:37:14 2011
@@ -1558,7 +1558,7 @@ bool dispatch_command(enum enum_server_command command
--- sql/sql_parse.cc.orig Tue Apr 12 14:11:38 2011
+++ sql/sql_parse.cc Thu Jun 30 10:57:33 2011
@@ -1572,7 +1572,7 @@ bool dispatch_command(enum enum_server_command command
length= my_snprintf(buff, buff_len - 1,
"Uptime: %lu Threads: %d Questions: %lu "
"Slow queries: %lu Opens: %lu Flush tables: %lu "

208
databases/mysql/pkg/PLIST-tests
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-tests,v 1.45 2010/12/26 08:23:17 ajacoutot Exp $
@comment $OpenBSD: PLIST-tests,v 1.46 2011/09/05 07:11:23 giovanni Exp $
@man man/man1/mysql-stress-test.pl.1
@man man/man1/mysql-test-run.pl.1
@man man/man1/mysql_client_test.1
@ -105,8 +105,6 @@ share/mysql-test/collections/default.daily
share/mysql-test/collections/default.experimental
share/mysql-test/collections/default.push
share/mysql-test/collections/default.weekly
share/mysql-test/collections/mysql-5.1-bugteam.daily
share/mysql-test/collections/mysql-5.1-bugteam.push
share/mysql-test/extra/
share/mysql-test/extra/binlog_tests/
share/mysql-test/extra/binlog_tests/binlog.test
@ -136,13 +134,14 @@ share/mysql-test/extra/rpl_tests/rpl_conflicts.test
share/mysql-test/extra/rpl_tests/rpl_ddl.test
share/mysql-test/extra/rpl_tests/rpl_deadlock.test
share/mysql-test/extra/rpl_tests/rpl_delete_no_where.test
share/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test
share/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
share/mysql-test/extra/rpl_tests/rpl_extra_col_master.test
share/mysql-test/extra/rpl_tests/rpl_extra_col_slave.test
share/mysql-test/extra/rpl_tests/rpl_failed_optimize.test
share/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test
share/mysql-test/extra/rpl_tests/rpl_foreign_key.test
share/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
share/mysql-test/extra/rpl_tests/rpl_insert_delayed.test
share/mysql-test/extra/rpl_tests/rpl_insert_duplicate.test
share/mysql-test/extra/rpl_tests/rpl_insert_id.test
share/mysql-test/extra/rpl_tests/rpl_insert_id_pk.test
share/mysql-test/extra/rpl_tests/rpl_insert_ignore.test
@ -176,11 +175,11 @@ share/mysql-test/extra/rpl_tests/rpl_row_sp006.test
share/mysql-test/extra/rpl_tests/rpl_row_sp007.test
share/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test
share/mysql-test/extra/rpl_tests/rpl_set_null.test
share/mysql-test/extra/rpl_tests/rpl_stm_000001.test
share/mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test
share/mysql-test/extra/rpl_tests/rpl_stm_create_if_not_exists.test
share/mysql-test/extra/rpl_tests/rpl_stop_slave.test
share/mysql-test/extra/rpl_tests/rpl_sv_relay_space.test
share/mysql-test/extra/rpl_tests/rpl_test_framework.inc
share/mysql-test/extra/rpl_tests/rpl_tmp_table_and_DDL.test
share/mysql-test/extra/rpl_tests/rpl_trig004.test
share/mysql-test/extra/rpl_tests/rpl_truncate.test
@ -189,6 +188,8 @@ share/mysql-test/include/
share/mysql-test/include/add_anonymous_users.inc
share/mysql-test/include/analyze-sync_with_master.test
share/mysql-test/include/analyze-timeout.test
share/mysql-test/include/assert.inc
share/mysql-test/include/begin_include_file.inc
share/mysql-test/include/big_test.inc
share/mysql-test/include/binlog_inject_error.inc
share/mysql-test/include/check-testcase.test
@ -202,14 +203,13 @@ share/mysql-test/include/check_slave_is_running.inc
share/mysql-test/include/check_slave_no_error.inc
share/mysql-test/include/check_slave_param.inc
share/mysql-test/include/check_var_limit.inc
share/mysql-test/include/circular_rpl_for_4_hosts_init.inc
share/mysql-test/include/circular_rpl_for_4_hosts_sync.inc
share/mysql-test/include/cleanup_fake_relay_log.inc
share/mysql-test/include/commit.inc
share/mysql-test/include/common-tests.inc
share/mysql-test/include/concurrent.inc
share/mysql-test/include/connect2.inc
share/mysql-test/include/count_sessions.inc
share/mysql-test/include/ctype_8bit.inc
share/mysql-test/include/ctype_common.inc
share/mysql-test/include/ctype_filesort.inc
share/mysql-test/include/ctype_german.inc
@ -226,9 +226,12 @@ share/mysql-test/include/default_my.cnf
share/mysql-test/include/default_mysqld.cnf
share/mysql-test/include/default_ndbd.cnf
share/mysql-test/include/delete_anonymous_users.inc
share/mysql-test/include/diff_master_slave.inc
share/mysql-test/include/diff_tables.inc
share/mysql-test/include/end_include_file.inc
share/mysql-test/include/endspace.inc
share/mysql-test/include/file_does_not_exist.inc
share/mysql-test/include/force_restart.inc
share/mysql-test/include/force_restart_if_skipped.inc
share/mysql-test/include/get_binlog_dump_thread_id.inc
share/mysql-test/include/get_relay_log_pos.inc
share/mysql-test/include/gis_generic.inc
@ -257,6 +260,7 @@ share/mysql-test/include/have_cp866.inc
share/mysql-test/include/have_cp932.inc
share/mysql-test/include/have_crypt.inc
share/mysql-test/include/have_csv.inc
share/mysql-test/include/have_dbi_dbd-mysql.inc
share/mysql-test/include/have_debug.inc
share/mysql-test/include/have_debug_sync.inc
share/mysql-test/include/have_dynamic_loading.inc
@ -301,14 +305,13 @@ share/mysql-test/include/index_merge_ror.inc
share/mysql-test/include/index_merge_ror_cpk.inc
share/mysql-test/include/innodb_rollback_on_timeout.inc
share/mysql-test/include/innodb_trx_weight.inc
share/mysql-test/include/io_thd_fault_injection.inc
share/mysql-test/include/is_embedded.inc
share/mysql-test/include/kill_query.inc
share/mysql-test/include/kill_query_and_diff_master_slave.inc
share/mysql-test/include/linux_sys_vars.inc
share/mysql-test/include/load_sysvars.inc
share/mysql-test/include/loaddata_autocom.inc
share/mysql-test/include/master-slave-end.inc
share/mysql-test/include/master-slave-reset.inc
share/mysql-test/include/master-slave.inc
share/mysql-test/include/min_null_cond.inc
share/mysql-test/include/mix1.inc
@ -336,6 +339,7 @@ share/mysql-test/include/no_valgrind_without_big.inc
share/mysql-test/include/not_as_root.inc
share/mysql-test/include/not_binlog_format_row.inc
share/mysql-test/include/not_blackhole.inc
share/mysql-test/include/not_crashrep.inc
share/mysql-test/include/not_embedded.inc
share/mysql-test/include/not_ndb.inc
share/mysql-test/include/not_ndb_default.inc
@ -357,19 +361,38 @@ share/mysql-test/include/query_cache.inc
share/mysql-test/include/query_cache_sql_prepare.inc
share/mysql-test/include/read_many_rows.inc
share/mysql-test/include/report-features.test
share/mysql-test/include/reset_master_and_slave.inc
share/mysql-test/include/restart_mysqld.inc
share/mysql-test/include/restart_slave_sql.inc
share/mysql-test/include/rowid_order.inc
share/mysql-test/include/rpl_diff_tables.inc
share/mysql-test/include/rpl_change_topology.inc
share/mysql-test/include/rpl_connect.inc
share/mysql-test/include/rpl_connection.inc
share/mysql-test/include/rpl_connection_master.inc
share/mysql-test/include/rpl_connection_slave.inc
share/mysql-test/include/rpl_connection_slave1.inc
share/mysql-test/include/rpl_diff.inc
share/mysql-test/include/rpl_end.inc
share/mysql-test/include/rpl_events.inc
share/mysql-test/include/rpl_for_each_slave.inc
share/mysql-test/include/rpl_generate_sync_chain.inc
share/mysql-test/include/rpl_init.inc
share/mysql-test/include/rpl_loaddata_charset.inc
share/mysql-test/include/rpl_multi_engine.inc
share/mysql-test/include/rpl_multi_engine2.inc
share/mysql-test/include/rpl_multi_engine3.inc
share/mysql-test/include/rpl_reconnect.inc
share/mysql-test/include/rpl_reset.inc
share/mysql-test/include/rpl_restart_server.inc
share/mysql-test/include/rpl_start_server.inc
share/mysql-test/include/rpl_start_slaves.inc
share/mysql-test/include/rpl_stmt_seq.inc
share/mysql-test/include/rpl_stop_server.inc
share/mysql-test/include/rpl_stop_slaves.inc
share/mysql-test/include/rpl_sync.inc
share/mysql-test/include/rpl_udf.inc
share/mysql-test/include/running_event_scheduler.inc
share/mysql-test/include/safe_set_to_maybe_ro_var.inc
share/mysql-test/include/save_master_pos.inc
share/mysql-test/include/select_ndb_apply_status.inc
share/mysql-test/include/set_binlog_format_mixed.sql
share/mysql-test/include/set_binlog_format_row.sql
@ -388,8 +411,12 @@ share/mysql-test/include/show_slave_status.inc
share/mysql-test/include/sp-vars.inc
share/mysql-test/include/start_slave.inc
share/mysql-test/include/stop_slave.inc
share/mysql-test/include/stop_slave_io.inc
share/mysql-test/include/stop_slave_sql.inc
share/mysql-test/include/strict_autoinc.inc
share/mysql-test/include/sync_io_with_master.inc
share/mysql-test/include/sync_slave_io_with_master.inc
share/mysql-test/include/sync_slave_sql_with_io.inc
share/mysql-test/include/system_db_struct.inc
share/mysql-test/include/test_fieldsize.inc
share/mysql-test/include/test_outfile.inc
@ -404,6 +431,7 @@ share/mysql-test/include/view_alias.inc
share/mysql-test/include/wait_condition.inc
share/mysql-test/include/wait_condition_sp.inc
share/mysql-test/include/wait_for_binlog_event.inc
share/mysql-test/include/wait_for_query_to_fail.inc
share/mysql-test/include/wait_for_query_to_succeed.inc
share/mysql-test/include/wait_for_slave_io_error.inc
share/mysql-test/include/wait_for_slave_io_to_start.inc
@ -423,6 +451,7 @@ share/mysql-test/include/wait_until_disconnected.inc
share/mysql-test/include/wait_until_rows_count.inc
share/mysql-test/include/windows.inc
share/mysql-test/include/windows_sys_vars.inc
share/mysql-test/include/write_var_to_file.inc
share/mysql-test/lib/
share/mysql-test/lib/My/
share/mysql-test/lib/My/Config.pm
@ -485,6 +514,7 @@ share/mysql-test/r/ansi.result
share/mysql-test/r/archive-big.result
share/mysql-test/r/archive.result
share/mysql-test/r/archive_bitfield.result
share/mysql-test/r/archive_debug.result
share/mysql-test/r/archive_gis.result
share/mysql-test/r/auto_increment.result
share/mysql-test/r/backup.result
@ -624,6 +654,7 @@ share/mysql-test/r/func_default.result
share/mysql-test/r/func_des_encrypt.result
share/mysql-test/r/func_encrypt.result
share/mysql-test/r/func_encrypt_nossl.result
share/mysql-test/r/func_encrypt_ucs2.result
share/mysql-test/r/func_equal.result
share/mysql-test/r/func_gconcat.result
share/mysql-test/r/func_group.result
@ -707,6 +738,7 @@ share/mysql-test/r/heap_auto_increment.result
share/mysql-test/r/heap_btree.result
share/mysql-test/r/heap_hash.result
share/mysql-test/r/help.result
share/mysql-test/r/implicit_char_to_num_conversion.result
share/mysql-test/r/index_merge_innodb.result
share/mysql-test/r/index_merge_myisam.result
share/mysql-test/r/information_schema.result
@ -866,8 +898,8 @@ share/mysql-test/r/partition_list.result
share/mysql-test/r/partition_mgm.result
share/mysql-test/r/partition_mgm_err.result
share/mysql-test/r/partition_mgm_err2.result
share/mysql-test/r/partition_myisam.result
share/mysql-test/r/partition_not_blackhole.result
share/mysql-test/r/partition_not_embedded.result
share/mysql-test/r/partition_not_windows.result
share/mysql-test/r/partition_open_files_limit.result
share/mysql-test/r/partition_order.result
@ -920,6 +952,7 @@ share/mysql-test/r/rpl_colSize.result
share/mysql-test/r/rpl_extraColmaster_innodb.result
share/mysql-test/r/rpl_extraColmaster_myisam.result
share/mysql-test/r/schema.result
share/mysql-test/r/secure_file_priv_win.result
share/mysql-test/r/select.result
share/mysql-test/r/select_found.result
share/mysql-test/r/select_safe.result
@ -955,6 +988,7 @@ share/mysql-test/r/sql_mode.result
share/mysql-test/r/ssl-big.result
share/mysql-test/r/ssl.result
share/mysql-test/r/ssl_8k_key.result
share/mysql-test/r/ssl_cipher.result
share/mysql-test/r/ssl_compress.result
share/mysql-test/r/ssl_connect.result
share/mysql-test/r/status.result
@ -1073,6 +1107,7 @@ share/mysql-test/std_data/bug49823.CSV
share/mysql-test/std_data/bug49823.frm
share/mysql-test/std_data/cacert.pem
share/mysql-test/std_data/charset_utf8.txt
share/mysql-test/std_data/checkDBI_DBD-mysql.pl
share/mysql-test/std_data/client-cert.pem
share/mysql-test/std_data/client-key.pem
share/mysql-test/std_data/corrupt-relay-bin.000624
@ -1190,10 +1225,12 @@ share/mysql-test/suite/
share/mysql-test/suite/binlog/
share/mysql-test/suite/binlog/combinations
share/mysql-test/suite/binlog/r/
share/mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result
share/mysql-test/suite/binlog/r/binlog_base64_flag.result
share/mysql-test/suite/binlog/r/binlog_bug23533.result
share/mysql-test/suite/binlog/r/binlog_bug36391.result
share/mysql-test/suite/binlog/r/binlog_database.result
share/mysql-test/suite/binlog/r/binlog_delete_and_flush_index.result
share/mysql-test/suite/binlog/r/binlog_drop_if_exists.result
share/mysql-test/suite/binlog/r/binlog_grant.result
share/mysql-test/suite/binlog/r/binlog_incident.result
share/mysql-test/suite/binlog/r/binlog_index.result
@ -1206,6 +1243,8 @@ share/mysql-test/suite/binlog/r/binlog_mixed_failure_mixing_engines.result
share/mysql-test/suite/binlog/r/binlog_mixed_load_data.result
share/mysql-test/suite/binlog/r/binlog_multi_engine.result
share/mysql-test/suite/binlog/r/binlog_old_versions.result
share/mysql-test/suite/binlog/r/binlog_query_filter_rules.result
share/mysql-test/suite/binlog/r/binlog_reset_master.result
share/mysql-test/suite/binlog/r/binlog_row_binlog.result
share/mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result
share/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result
@ -1216,6 +1255,8 @@ share/mysql-test/suite/binlog/r/binlog_row_insert_select.result
share/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
share/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_db_filter.result
share/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_verbose.result
share/mysql-test/suite/binlog/r/binlog_server_id.result
share/mysql-test/suite/binlog/r/binlog_sf.result
share/mysql-test/suite/binlog/r/binlog_sql_mode.result
share/mysql-test/suite/binlog/r/binlog_start_comment.result
share/mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result
@ -1249,11 +1290,13 @@ share/mysql-test/suite/binlog/std_data/ver_5_1_23.001
share/mysql-test/suite/binlog/std_data/write-full-row.binlog
share/mysql-test/suite/binlog/std_data/write-partial-row.binlog
share/mysql-test/suite/binlog/t/
share/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029-master.opt
share/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test
share/mysql-test/suite/binlog/t/binlog_base64_flag.test
share/mysql-test/suite/binlog/t/binlog_bug23533.test
share/mysql-test/suite/binlog/t/binlog_bug36391-master.opt
share/mysql-test/suite/binlog/t/binlog_bug36391.test
share/mysql-test/suite/binlog/t/binlog_database.test
share/mysql-test/suite/binlog/t/binlog_delete_and_flush_index.test
share/mysql-test/suite/binlog/t/binlog_drop_if_exists.test
share/mysql-test/suite/binlog/t/binlog_grant.test
share/mysql-test/suite/binlog/t/binlog_incident-master.opt
share/mysql-test/suite/binlog/t/binlog_incident.test
@ -1269,6 +1312,9 @@ share/mysql-test/suite/binlog/t/binlog_mixed_failure_mixing_engines.test
share/mysql-test/suite/binlog/t/binlog_mixed_load_data.test
share/mysql-test/suite/binlog/t/binlog_multi_engine.test
share/mysql-test/suite/binlog/t/binlog_old_versions.test
share/mysql-test/suite/binlog/t/binlog_query_filter_rules-master.opt
share/mysql-test/suite/binlog/t/binlog_query_filter_rules.test
share/mysql-test/suite/binlog/t/binlog_reset_master.test
share/mysql-test/suite/binlog/t/binlog_row_binlog-master.opt
share/mysql-test/suite/binlog/t/binlog_row_binlog.test
share/mysql-test/suite/binlog/t/binlog_row_ctype_cp932.test
@ -1282,6 +1328,8 @@ share/mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt
share/mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test
share/mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_db_filter.test
share/mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_verbose.test
share/mysql-test/suite/binlog/t/binlog_server_id.test
share/mysql-test/suite/binlog/t/binlog_sf.test
share/mysql-test/suite/binlog/t/binlog_sql_mode.test
share/mysql-test/suite/binlog/t/binlog_start_comment.test
share/mysql-test/suite/binlog/t/binlog_statement_insert_delayed.test
@ -1309,29 +1357,6 @@ share/mysql-test/suite/binlog/t/binlog_truncate_myisam.test
share/mysql-test/suite/binlog/t/binlog_unsafe.test
share/mysql-test/suite/binlog/t/binlog_write_error.test
share/mysql-test/suite/binlog/t/disabled.def
share/mysql-test/suite/bugs/
share/mysql-test/suite/bugs/combinations
share/mysql-test/suite/bugs/data/
share/mysql-test/suite/bugs/data/rpl_bug12691.dat
share/mysql-test/suite/bugs/r/
share/mysql-test/suite/bugs/r/rpl_bug12691.result
share/mysql-test/suite/bugs/r/rpl_bug23533.result
share/mysql-test/suite/bugs/r/rpl_bug31582.result
share/mysql-test/suite/bugs/r/rpl_bug31583.result
share/mysql-test/suite/bugs/r/rpl_bug33029.result
share/mysql-test/suite/bugs/r/rpl_bug36391.result
share/mysql-test/suite/bugs/r/rpl_bug37426.result
share/mysql-test/suite/bugs/r/rpl_bug38205.result
share/mysql-test/suite/bugs/t/
share/mysql-test/suite/bugs/t/rpl_bug12691.test
share/mysql-test/suite/bugs/t/rpl_bug23533.test
share/mysql-test/suite/bugs/t/rpl_bug31582.test
share/mysql-test/suite/bugs/t/rpl_bug31583.test
share/mysql-test/suite/bugs/t/rpl_bug33029.test
share/mysql-test/suite/bugs/t/rpl_bug36391-master.opt
share/mysql-test/suite/bugs/t/rpl_bug36391.test
share/mysql-test/suite/bugs/t/rpl_bug37426.test
share/mysql-test/suite/bugs/t/rpl_bug38205.test
share/mysql-test/suite/engines/
share/mysql-test/suite/engines/README
share/mysql-test/suite/engines/funcs/
@ -2268,6 +2293,8 @@ share/mysql-test/suite/federated/federated_bug_13118.result
share/mysql-test/suite/federated/federated_bug_13118.test
share/mysql-test/suite/federated/federated_bug_25714.result
share/mysql-test/suite/federated/federated_bug_25714.test
share/mysql-test/suite/federated/federated_bug_35333.result
share/mysql-test/suite/federated/federated_bug_35333.test
share/mysql-test/suite/federated/federated_cleanup.inc
share/mysql-test/suite/federated/federated_debug-master.opt
share/mysql-test/suite/federated/federated_debug.result
@ -2453,7 +2480,7 @@ share/mysql-test/suite/funcs_1/r/myisam_trig_0407.result
share/mysql-test/suite/funcs_1/r/myisam_trig_08.result
share/mysql-test/suite/funcs_1/r/myisam_trig_09.result
share/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
share/mysql-test/suite/funcs_1/r/myisam_views.result
share/mysql-test/suite/funcs_1/r/myisam_views-big.result
share/mysql-test/suite/funcs_1/r/ndb_bitdata.result
share/mysql-test/suite/funcs_1/r/ndb_cursors.result
share/mysql-test/suite/funcs_1/r/ndb_func_view.result
@ -2605,7 +2632,7 @@ share/mysql-test/suite/funcs_1/t/myisam_trig_0407.test
share/mysql-test/suite/funcs_1/t/myisam_trig_08.test
share/mysql-test/suite/funcs_1/t/myisam_trig_09.test
share/mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
share/mysql-test/suite/funcs_1/t/myisam_views.test
share/mysql-test/suite/funcs_1/t/myisam_views-big.test
share/mysql-test/suite/funcs_1/t/ndb_bitdata.test
share/mysql-test/suite/funcs_1/t/ndb_cursors.test
share/mysql-test/suite/funcs_1/t/ndb_func_view.test
@ -2692,6 +2719,7 @@ share/mysql-test/suite/innodb/r/innodb-ucs2.result
share/mysql-test/suite/innodb/r/innodb.result
share/mysql-test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
share/mysql-test/suite/innodb/r/innodb_bug21704.result
share/mysql-test/suite/innodb/r/innodb_bug30423.result
share/mysql-test/suite/innodb/r/innodb_bug30919.result
share/mysql-test/suite/innodb/r/innodb_bug34053.result
share/mysql-test/suite/innodb/r/innodb_bug34300.result
@ -2719,6 +2747,9 @@ share/mysql-test/suite/innodb/r/innodb_bug56680.result
share/mysql-test/suite/innodb/r/innodb_bug56716.result
share/mysql-test/suite/innodb/r/innodb_bug57252.result
share/mysql-test/suite/innodb/r/innodb_bug57255.result
share/mysql-test/suite/innodb/r/innodb_bug59410.result
share/mysql-test/suite/innodb/r/innodb_bug59641.result
share/mysql-test/suite/innodb/r/innodb_bug60049.result
share/mysql-test/suite/innodb/r/innodb_gis.result
share/mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result
share/mysql-test/suite/innodb/r/innodb_misc1.result
@ -2743,6 +2774,7 @@ share/mysql-test/suite/innodb/t/innodb.test
share/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt
share/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
share/mysql-test/suite/innodb/t/innodb_bug21704.test
share/mysql-test/suite/innodb/t/innodb_bug30423.test
share/mysql-test/suite/innodb/t/innodb_bug30919-master.opt
share/mysql-test/suite/innodb/t/innodb_bug30919.test
share/mysql-test/suite/innodb/t/innodb_bug34053.test
@ -2776,6 +2808,10 @@ share/mysql-test/suite/innodb/t/innodb_bug56680.test
share/mysql-test/suite/innodb/t/innodb_bug56716.test
share/mysql-test/suite/innodb/t/innodb_bug57252.test
share/mysql-test/suite/innodb/t/innodb_bug57255.test
share/mysql-test/suite/innodb/t/innodb_bug59410.test
share/mysql-test/suite/innodb/t/innodb_bug59641.test
share/mysql-test/suite/innodb/t/innodb_bug60049-master.opt
share/mysql-test/suite/innodb/t/innodb_bug60049.test
share/mysql-test/suite/innodb/t/innodb_gis.test
share/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1-master.opt
share/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test
@ -2797,7 +2833,9 @@ share/mysql-test/suite/innodb_plugin/include/innodb-index.inc
share/mysql-test/suite/innodb_plugin/include/innodb_trx_weight.inc
share/mysql-test/suite/innodb_plugin/r/
share/mysql-test/suite/innodb_plugin/r/innodb-analyze.result
share/mysql-test/suite/innodb_plugin/r/innodb-autoinc-18274.result
share/mysql-test/suite/innodb_plugin/r/innodb-autoinc-44030.result
share/mysql-test/suite/innodb_plugin/r/innodb-autoinc-56228.result
share/mysql-test/suite/innodb_plugin/r/innodb-autoinc-optimize.result
share/mysql-test/suite/innodb_plugin/r/innodb-autoinc.result
share/mysql-test/suite/innodb_plugin/r/innodb-consistent.result
@ -2814,6 +2852,7 @@ share/mysql-test/suite/innodb_plugin/r/innodb-zip.result
share/mysql-test/suite/innodb_plugin/r/innodb.result
share/mysql-test/suite/innodb_plugin/r/innodb_autoinc_lock_mode_zero.result
share/mysql-test/suite/innodb_plugin/r/innodb_bug21704.result
share/mysql-test/suite/innodb_plugin/r/innodb_bug30423.result
share/mysql-test/suite/innodb_plugin/r/innodb_bug30919.result
share/mysql-test/suite/innodb_plugin/r/innodb_bug34053.result
share/mysql-test/suite/innodb_plugin/r/innodb_bug34300.result
@ -2858,6 +2897,10 @@ share/mysql-test/suite/innodb_plugin/r/innodb_bug56716.result
share/mysql-test/suite/innodb_plugin/r/innodb_bug56947.result
share/mysql-test/suite/innodb_plugin/r/innodb_bug57252.result
share/mysql-test/suite/innodb_plugin/r/innodb_bug57255.result
share/mysql-test/suite/innodb_plugin/r/innodb_bug59307.result
share/mysql-test/suite/innodb_plugin/r/innodb_bug59410.result
share/mysql-test/suite/innodb_plugin/r/innodb_bug59641.result
share/mysql-test/suite/innodb_plugin/r/innodb_bug60049.result
share/mysql-test/suite/innodb_plugin/r/innodb_file_format.result
share/mysql-test/suite/innodb_plugin/r/innodb_gis.result
share/mysql-test/suite/innodb_plugin/r/innodb_information_schema.result
@ -2871,7 +2914,10 @@ share/mysql-test/suite/innodb_plugin/r/innodb_trx_weight.result
share/mysql-test/suite/innodb_plugin/t/
share/mysql-test/suite/innodb_plugin/t/disabled.def
share/mysql-test/suite/innodb_plugin/t/innodb-analyze.test
share/mysql-test/suite/innodb_plugin/t/innodb-autoinc-18274.test
share/mysql-test/suite/innodb_plugin/t/innodb-autoinc-44030.test
share/mysql-test/suite/innodb_plugin/t/innodb-autoinc-56228-master.opt
share/mysql-test/suite/innodb_plugin/t/innodb-autoinc-56228.test
share/mysql-test/suite/innodb_plugin/t/innodb-autoinc-optimize.test
share/mysql-test/suite/innodb_plugin/t/innodb-autoinc.test
share/mysql-test/suite/innodb_plugin/t/innodb-consistent-master.opt
@ -2893,6 +2939,7 @@ share/mysql-test/suite/innodb_plugin/t/innodb.test
share/mysql-test/suite/innodb_plugin/t/innodb_autoinc_lock_mode_zero-master.opt
share/mysql-test/suite/innodb_plugin/t/innodb_autoinc_lock_mode_zero.test
share/mysql-test/suite/innodb_plugin/t/innodb_bug21704.test
share/mysql-test/suite/innodb_plugin/t/innodb_bug30423.test
share/mysql-test/suite/innodb_plugin/t/innodb_bug30919-master.opt
share/mysql-test/suite/innodb_plugin/t/innodb_bug30919.test
share/mysql-test/suite/innodb_plugin/t/innodb_bug34053.test
@ -2942,6 +2989,11 @@ share/mysql-test/suite/innodb_plugin/t/innodb_bug56716.test
share/mysql-test/suite/innodb_plugin/t/innodb_bug56947.test
share/mysql-test/suite/innodb_plugin/t/innodb_bug57252.test
share/mysql-test/suite/innodb_plugin/t/innodb_bug57255.test
share/mysql-test/suite/innodb_plugin/t/innodb_bug59307.test
share/mysql-test/suite/innodb_plugin/t/innodb_bug59410.test
share/mysql-test/suite/innodb_plugin/t/innodb_bug59641.test
share/mysql-test/suite/innodb_plugin/t/innodb_bug60049-master.opt
share/mysql-test/suite/innodb_plugin/t/innodb_bug60049.test
share/mysql-test/suite/innodb_plugin/t/innodb_file_format.test
share/mysql-test/suite/innodb_plugin/t/innodb_gis.test
share/mysql-test/suite/innodb_plugin/t/innodb_information_schema.test
@ -3656,28 +3708,30 @@ share/mysql-test/suite/rpl/my.cnf
share/mysql-test/suite/rpl/r/
share/mysql-test/suite/rpl/r/rpl000001.a.result
share/mysql-test/suite/rpl/r/rpl000001.b.result
share/mysql-test/suite/rpl/r/rpl000010.result
share/mysql-test/suite/rpl/r/rpl000011.result
share/mysql-test/suite/rpl/r/rpl000013.result
share/mysql-test/suite/rpl/r/rpl000017.result
share/mysql-test/suite/rpl/r/rpl_000010.result
share/mysql-test/suite/rpl/r/rpl_000011.result
share/mysql-test/suite/rpl/r/rpl_000013.result
share/mysql-test/suite/rpl/r/rpl_000017.result
share/mysql-test/suite/rpl/r/rpl_EE_err.result
share/mysql-test/suite/rpl/r/rpl_LD_INFILE.result
share/mysql-test/suite/rpl/r/rpl_alter.result
share/mysql-test/suite/rpl/r/rpl_alter_db.result
share/mysql-test/suite/rpl/r/rpl_auto_increment.result
share/mysql-test/suite/rpl/r/rpl_auto_increment_11932.result
share/mysql-test/suite/rpl/r/rpl_auto_increment_bug33029.result
share/mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result
share/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
share/mysql-test/suite/rpl/r/rpl_binlog_corruption.result
share/mysql-test/suite/rpl/r/rpl_binlog_errors.result
share/mysql-test/suite/rpl/r/rpl_binlog_grant.result
share/mysql-test/suite/rpl/r/rpl_binlog_max_cache_size.result
share/mysql-test/suite/rpl/r/rpl_binlog_query_filter_rules.result
share/mysql-test/suite/rpl/r/rpl_bit.result
share/mysql-test/suite/rpl/r/rpl_bit_npk.result
share/mysql-test/suite/rpl/r/rpl_blackhole.result
share/mysql-test/suite/rpl/r/rpl_bug26395.result
share/mysql-test/suite/rpl/r/rpl_bug31076.result
share/mysql-test/suite/rpl/r/rpl_bug33931.result
share/mysql-test/suite/rpl/r/rpl_bug37426.result
share/mysql-test/suite/rpl/r/rpl_bug38694.result
share/mysql-test/suite/rpl/r/rpl_change_master.result
share/mysql-test/suite/rpl/r/rpl_charset.result
@ -3700,17 +3754,16 @@ share/mysql-test/suite/rpl/r/rpl_delete_no_where.result
share/mysql-test/suite/rpl/r/rpl_do_grant.result
share/mysql-test/suite/rpl/r/rpl_drop.result
share/mysql-test/suite/rpl/r/rpl_drop_db.result
share/mysql-test/suite/rpl/r/rpl_drop_if_exists.result
share/mysql-test/suite/rpl/r/rpl_drop_temp.result
share/mysql-test/suite/rpl/r/rpl_drop_view.result
share/mysql-test/suite/rpl/r/rpl_dual_pos_advance.result
share/mysql-test/suite/rpl/r/rpl_empty_master_crash.result
share/mysql-test/suite/rpl/r/rpl_err_ignoredtable.result
share/mysql-test/suite/rpl/r/rpl_events.result
share/mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
share/mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
share/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result
share/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result
share/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result
share/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result
share/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result
share/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result
share/mysql-test/suite/rpl/r/rpl_failed_optimize.result
share/mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result
share/mysql-test/suite/rpl/r/rpl_flushlog_loop.result
@ -3735,6 +3788,7 @@ share/mysql-test/suite/rpl/r/rpl_innodb_bug30888.result
share/mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result
share/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
share/mysql-test/suite/rpl/r/rpl_insert.result
share/mysql-test/suite/rpl/r/rpl_insert_duplicate.result
share/mysql-test/suite/rpl/r/rpl_insert_id.result
share/mysql-test/suite/rpl/r/rpl_insert_id_pk.result
share/mysql-test/suite/rpl/r/rpl_insert_ignore.result
@ -3850,14 +3904,12 @@ share/mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result
share/mysql-test/suite/rpl/r/rpl_row_until.result
share/mysql-test/suite/rpl/r/rpl_row_view01.result
share/mysql-test/suite/rpl/r/rpl_row_wide_table.result
share/mysql-test/suite/rpl/r/rpl_server_id.result
share/mysql-test/suite/rpl/r/rpl_server_id1.result
share/mysql-test/suite/rpl/r/rpl_server_id2.result
share/mysql-test/suite/rpl/r/rpl_session_var.result
share/mysql-test/suite/rpl/r/rpl_set_charset.result
share/mysql-test/suite/rpl/r/rpl_set_null_innodb.result
share/mysql-test/suite/rpl/r/rpl_set_null_myisam.result
share/mysql-test/suite/rpl/r/rpl_sf.result
share/mysql-test/suite/rpl/r/rpl_show_slave_running.result
share/mysql-test/suite/rpl/r/rpl_skip_error.result
share/mysql-test/suite/rpl/r/rpl_slave_grp_exec.result
@ -3897,6 +3949,7 @@ share/mysql-test/suite/rpl/r/rpl_temp_table.result
share/mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result
share/mysql-test/suite/rpl/r/rpl_temporary.result
share/mysql-test/suite/rpl/r/rpl_temporary_errors.result
share/mysql-test/suite/rpl/r/rpl_test_framework.result
share/mysql-test/suite/rpl/r/rpl_timezone.result
share/mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result
share/mysql-test/suite/rpl/r/rpl_trigger.result
@ -3913,13 +3966,12 @@ share/mysql-test/suite/rpl/r/rpl_view.result
share/mysql-test/suite/rpl/rpl_1slave_base.cnf
share/mysql-test/suite/rpl/t/
share/mysql-test/suite/rpl/t/disabled.def
share/mysql-test/suite/rpl/t/rpl000010-slave.opt
share/mysql-test/suite/rpl/t/rpl000010.test
share/mysql-test/suite/rpl/t/rpl000011.test
share/mysql-test/suite/rpl/t/rpl000013.test
share/mysql-test/suite/rpl/t/rpl000017-slave.opt
share/mysql-test/suite/rpl/t/rpl000017-slave.sh
share/mysql-test/suite/rpl/t/rpl000017.test
share/mysql-test/suite/rpl/t/rpl_000010-slave.opt
share/mysql-test/suite/rpl/t/rpl_000010.test
share/mysql-test/suite/rpl/t/rpl_000011.test
share/mysql-test/suite/rpl/t/rpl_000013.test
share/mysql-test/suite/rpl/t/rpl_000017-slave.opt
share/mysql-test/suite/rpl/t/rpl_000017.test
share/mysql-test/suite/rpl/t/rpl_EE_err.test
share/mysql-test/suite/rpl/t/rpl_LD_INFILE.test
share/mysql-test/suite/rpl/t/rpl_alter.test
@ -3927,22 +3979,23 @@ share/mysql-test/suite/rpl/t/rpl_alter_db.test
share/mysql-test/suite/rpl/t/rpl_auto_increment-master.opt
share/mysql-test/suite/rpl/t/rpl_auto_increment.test
share/mysql-test/suite/rpl/t/rpl_auto_increment_11932.test
share/mysql-test/suite/rpl/t/rpl_auto_increment_bug33029.test
share/mysql-test/suite/rpl/t/rpl_auto_increment_update_failure.test
share/mysql-test/suite/rpl/t/rpl_begin_commit_rollback-master.opt
share/mysql-test/suite/rpl/t/rpl_begin_commit_rollback-slave.opt
share/mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test
share/mysql-test/suite/rpl/t/rpl_binlog_corruption-master.opt
share/mysql-test/suite/rpl/t/rpl_binlog_corruption.test
share/mysql-test/suite/rpl/t/rpl_binlog_errors-master.opt
share/mysql-test/suite/rpl/t/rpl_binlog_errors.test
share/mysql-test/suite/rpl/t/rpl_binlog_grant.test
share/mysql-test/suite/rpl/t/rpl_binlog_max_cache_size.test
share/mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules-master.opt
share/mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test
share/mysql-test/suite/rpl/t/rpl_bit.test
share/mysql-test/suite/rpl/t/rpl_bit_npk.test
share/mysql-test/suite/rpl/t/rpl_blackhole.test
share/mysql-test/suite/rpl/t/rpl_bug26395.test
share/mysql-test/suite/rpl/t/rpl_bug31076.test
share/mysql-test/suite/rpl/t/rpl_bug33931.test
share/mysql-test/suite/rpl/t/rpl_bug37426.test
share/mysql-test/suite/rpl/t/rpl_bug38694-slave.opt
share/mysql-test/suite/rpl/t/rpl_bug38694.test
share/mysql-test/suite/rpl/t/rpl_change_master.test
@ -3973,7 +4026,6 @@ share/mysql-test/suite/rpl/t/rpl_delete_no_where.test
share/mysql-test/suite/rpl/t/rpl_do_grant.test
share/mysql-test/suite/rpl/t/rpl_drop.test
share/mysql-test/suite/rpl/t/rpl_drop_db.test
share/mysql-test/suite/rpl/t/rpl_drop_if_exists.test
share/mysql-test/suite/rpl/t/rpl_drop_temp-slave.opt
share/mysql-test/suite/rpl/t/rpl_drop_temp.test
share/mysql-test/suite/rpl/t/rpl_drop_view.test
@ -3984,18 +4036,16 @@ share/mysql-test/suite/rpl/t/rpl_empty_master_crash.test
share/mysql-test/suite/rpl/t/rpl_err_ignoredtable-slave.opt
share/mysql-test/suite/rpl/t/rpl_err_ignoredtable.test
share/mysql-test/suite/rpl/t/rpl_events.test
share/mysql-test/suite/rpl/t/rpl_extraCol_innodb.test
share/mysql-test/suite/rpl/t/rpl_extraCol_myisam.test
share/mysql-test/suite/rpl/t/rpl_extraColmaster_innodb.test
share/mysql-test/suite/rpl/t/rpl_extraColmaster_myisam.test
share/mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test
share/mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test
share/mysql-test/suite/rpl/t/rpl_extra_col_slave_innodb.test
share/mysql-test/suite/rpl/t/rpl_extra_col_slave_myisam.test
share/mysql-test/suite/rpl/t/rpl_failed_optimize-master.opt
share/mysql-test/suite/rpl/t/rpl_failed_optimize.test
share/mysql-test/suite/rpl/t/rpl_filter_tables_not_exist-slave.opt
share/mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test
share/mysql-test/suite/rpl/t/rpl_flushlog_loop-master.opt
share/mysql-test/suite/rpl/t/rpl_flushlog_loop-master.sh
share/mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.opt
share/mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.sh
share/mysql-test/suite/rpl/t/rpl_flushlog_loop.test
share/mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test
share/mysql-test/suite/rpl/t/rpl_found_rows.test
@ -4030,6 +4080,7 @@ share/mysql-test/suite/rpl/t/rpl_innodb_bug30888.test
share/mysql-test/suite/rpl/t/rpl_innodb_mixed_ddl.test
share/mysql-test/suite/rpl/t/rpl_innodb_mixed_dml.test
share/mysql-test/suite/rpl/t/rpl_insert.test
share/mysql-test/suite/rpl/t/rpl_insert_duplicate.test
share/mysql-test/suite/rpl/t/rpl_insert_id.test
share/mysql-test/suite/rpl/t/rpl_insert_id_pk.test
share/mysql-test/suite/rpl/t/rpl_insert_ignore.test
@ -4111,8 +4162,6 @@ share/mysql-test/suite/rpl/t/rpl_report-slave.opt
share/mysql-test/suite/rpl/t/rpl_report.test
share/mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt
share/mysql-test/suite/rpl/t/rpl_rewrt_db.test
share/mysql-test/suite/rpl/t/rpl_rotate_logs-slave.opt
share/mysql-test/suite/rpl/t/rpl_rotate_logs-slave.sh
share/mysql-test/suite/rpl/t/rpl_rotate_logs.cnf
share/mysql-test/suite/rpl/t/rpl_rotate_logs.test
share/mysql-test/suite/rpl/t/rpl_row_001.test
@ -4179,7 +4228,6 @@ share/mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test
share/mysql-test/suite/rpl/t/rpl_row_until.test
share/mysql-test/suite/rpl/t/rpl_row_view01.test
share/mysql-test/suite/rpl/t/rpl_row_wide_table.test
share/mysql-test/suite/rpl/t/rpl_server_id.test
share/mysql-test/suite/rpl/t/rpl_server_id1.test
share/mysql-test/suite/rpl/t/rpl_server_id2-slave.opt
share/mysql-test/suite/rpl/t/rpl_server_id2.test
@ -4187,7 +4235,6 @@ share/mysql-test/suite/rpl/t/rpl_session_var.test
share/mysql-test/suite/rpl/t/rpl_set_charset.test
share/mysql-test/suite/rpl/t/rpl_set_null_innodb.test
share/mysql-test/suite/rpl/t/rpl_set_null_myisam.test
share/mysql-test/suite/rpl/t/rpl_sf.test
share/mysql-test/suite/rpl/t/rpl_show_slave_running.test
share/mysql-test/suite/rpl/t/rpl_skip_error-slave.opt
share/mysql-test/suite/rpl/t/rpl_skip_error.test
@ -4242,6 +4289,8 @@ share/mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test
share/mysql-test/suite/rpl/t/rpl_temporary.test
share/mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt
share/mysql-test/suite/rpl/t/rpl_temporary_errors.test
share/mysql-test/suite/rpl/t/rpl_test_framework.cnf
share/mysql-test/suite/rpl/t/rpl_test_framework.test
share/mysql-test/suite/rpl/t/rpl_timezone-master.opt
share/mysql-test/suite/rpl/t/rpl_timezone-slave.opt
share/mysql-test/suite/rpl/t/rpl_timezone.test
@ -4428,6 +4477,7 @@ share/mysql-test/t/ansi.test
share/mysql-test/t/archive-big.test
share/mysql-test/t/archive.test
share/mysql-test/t/archive_bitfield.test
share/mysql-test/t/archive_debug.test
share/mysql-test/t/archive_gis.test
share/mysql-test/t/auto_increment.test
share/mysql-test/t/backup-master.sh
@ -4584,6 +4634,7 @@ share/mysql-test/t/func_des_encrypt.test
share/mysql-test/t/func_encrypt-master.opt
share/mysql-test/t/func_encrypt.test
share/mysql-test/t/func_encrypt_nossl.test
share/mysql-test/t/func_encrypt_ucs2.test
share/mysql-test/t/func_equal.test
share/mysql-test/t/func_gconcat.test
share/mysql-test/t/func_group.test
@ -4626,6 +4677,7 @@ share/mysql-test/t/heap_auto_increment.test
share/mysql-test/t/heap_btree.test
share/mysql-test/t/heap_hash.test
share/mysql-test/t/help.test
share/mysql-test/t/implicit_char_to_num_conversion.test
share/mysql-test/t/index_merge_innodb.test
share/mysql-test/t/index_merge_myisam.test
share/mysql-test/t/information_schema.test
@ -4813,9 +4865,9 @@ share/mysql-test/t/partition_list.test
share/mysql-test/t/partition_mgm.test
share/mysql-test/t/partition_mgm_err.test
share/mysql-test/t/partition_mgm_err2.test
share/mysql-test/t/partition_myisam.test
share/mysql-test/t/partition_not_blackhole-master.opt
share/mysql-test/t/partition_not_blackhole.test
share/mysql-test/t/partition_not_embedded.test
share/mysql-test/t/partition_not_windows-master.opt
share/mysql-test/t/partition_not_windows.test
share/mysql-test/t/partition_open_files_limit-master.opt
@ -4870,6 +4922,8 @@ share/mysql-test/t/round.test
share/mysql-test/t/row.test
share/mysql-test/t/rowid_order_innodb.test
share/mysql-test/t/schema.test
share/mysql-test/t/secure_file_priv_win-master.opt
share/mysql-test/t/secure_file_priv_win.test
share/mysql-test/t/select.test
share/mysql-test/t/select_found.test
share/mysql-test/t/select_safe.test
@ -4907,6 +4961,8 @@ share/mysql-test/t/ssl-big.test
share/mysql-test/t/ssl.test
share/mysql-test/t/ssl_8k_key-master.opt
share/mysql-test/t/ssl_8k_key.test
share/mysql-test/t/ssl_cipher-master.opt
share/mysql-test/t/ssl_cipher.test
share/mysql-test/t/ssl_compress.test
share/mysql-test/t/ssl_connect.test
share/mysql-test/t/status-master.opt