Changes 5.6.13:

* Important Change; Replication: By default, when promoting integers from a smaller type on the master to a larger type on the slave (for example, from a SMALLINT column on the master to a BIGINT column on the slave), the promoted values are treated as though they are signed. Now in such cases it is possible to modify or override this behavior using one or both of ALL_SIGNED, ALL_UNSIGNED in the set of values specified for the slave_type_conversions server system variable. For more information, see Row-based replication: attribute promotion and demotion, as well as the description of the variable.

* Previously, program options could be specified in full or as any unambiguous prefix. For example, the --compress option could be given to mysqldump as --compr, but not as --comp because the latter is ambiguous. Option prefixes now are deprecated. They can cause problems when new options are implemented for programs. A prefix that is currently unambiguous might become ambiguous in the future. If an unambiguous prefix is given, a warning now occurs to provide feedback. For example:

Warning: Using unique option prefix compr instead of compress is
deprecated and will be removed in a future release. Please use the
full name instead.

Option prefixes are no longer supported in MySQL 5.7; only full options are accepted.

* The C API libmysqlclient shared-library .so files now have version 18.1.0 (up from version 18.0.0 used in MySQL 5.5).

* In batch mode, mysql formatted result status messages such as “"Query OK, 1 row affected"” but did not print them. Now these messages are not formatted.

* Bugs Fixed

9 files changed, 73 insertions, 64 deletions

diff --git a/databases/mysql56-client/Makefile.common b/databases/mysql56-client/Makefile.common
index df2a79238cc..b042f95f63d 100644
--- a/databases/mysql56-client/Makefile.common
+++ b/databases/mysql56-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.8 2013/07/15 02:02:19 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.9 2013/07/31 09:51:38 adam Exp $
 #
 # used by databases/mysql56-client/Makefile
 # used by databases/mysql56-server/Makefile
 
-DISTNAME=	mysql-5.6.12
+DISTNAME=	mysql-5.6.13
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.6/}
 
@@ -60,7 +60,6 @@ CMAKE_ARGS+=		-DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
 CMAKE_ARGS+=		-DINSTALL_SUPPORTFILESDIR="share/mysql"
 CMAKE_ARGS+=		-DMYSQL_DATADIR=${MYSQL_DATADIR}
 
-# always use our own readline, not MySQL bundled one
 CMAKE_ARGS+=		-DWITH_ZLIB="system"
 CMAKE_ARGS+=		-DDEFAULT_CHARSET=${MYSQL_CHARSET:Q}
 CMAKE_ARGS+=		-DDEFAULT_COLLATION=${MYSQL_COLLATION:Q}
@@ -111,13 +110,19 @@ SUBST_SED.scr=		-e "s,chown,${CHOWN},g"
 SUBST_SED.scr+=		-e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
 SUBST_MESSAGE.scr=	Fixing scripts.
 
+.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+SOEXT="dylib"
+.else
+SOEXT="so"
+.endif
+
 .include "../../mk/readline.buildlink3.mk"
 
 CMAKE_ARGS+=	-DWITH_EDITLINE=system
 .if !empty(READLINE_TYPE:Meditline)
-CMAKE_ARGS+=	-DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.editlinereadline}/lib/libedit.so
+CMAKE_ARGS+=	-DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.editlinereadline}/lib/libedit.${SOEXT}
 .elif !empty(READLINE_TYPE:Mreadline)
-CMAKE_ARGS+=	-DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.editlinereadline}/lib/libreadline.so
+CMAKE_ARGS+=	-DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.editlinereadline}/lib/libreadline.${SOEXT}
 .endif
 CMAKE_ARGS+=	-DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editlinereadline}/include/readline
 
diff --git a/databases/mysql56-client/PLIST b/databases/mysql56-client/PLIST
index 24f401ff587..0f476daf552 100644
--- a/databases/mysql56-client/PLIST
+++ b/databases/mysql56-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2013/02/13 21:00:02 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/07/31 09:51:38 adam Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_client_test
@@ -103,11 +103,11 @@ include/mysql/typelib.h
 lib/libmysqlclient.a
 lib/libmysqlclient.so
 lib/libmysqlclient.so.18
-lib/libmysqlclient.so.18.0.0
+lib/libmysqlclient.so.18.1.0
 lib/libmysqlclient_r.a
 lib/libmysqlclient_r.so
 lib/libmysqlclient_r.so.18
-lib/libmysqlclient_r.so.18.0.0
+lib/libmysqlclient_r.so.18.1.0
 man/man1/comp_err.1
 man/man1/innochecksum.1
 man/man1/msql2mysql.1
diff --git a/databases/mysql56-client/distinfo b/databases/mysql56-client/distinfo
index 28b34810c62..271694d6a7c 100644
--- a/databases/mysql56-client/distinfo
+++ b/databases/mysql56-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2013/07/29 13:39:06 prlw1 Exp $
+$NetBSD: distinfo,v 1.9 2013/07/31 09:51:38 adam Exp $
 
-SHA1 (mysql-5.6.12.tar.gz) = c48ae4061c23db89de7ebd2d25abbc36283bab69
-RMD160 (mysql-5.6.12.tar.gz) = 235b2c7b52ca40b98b08d0b27ebd0154d71f6a83
-Size (mysql-5.6.12.tar.gz) = 35853760 bytes
+SHA1 (mysql-5.6.13.tar.gz) = 06e1d856cfb1f98844ef92af47d4f4f7036ef294
+RMD160 (mysql-5.6.13.tar.gz) = 22411eda9da0d931a44ab0710ded76c065cd05e6
+Size (mysql-5.6.13.tar.gz) = 35951160 bytes
 SHA1 (patch-CMakeLists.txt) = 1889afcd79a271d3f9ac0e234c449ef6aa8ca818
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
@@ -16,7 +16,7 @@ SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5
 SHA1 (patch-include_my_net.h) = b08aa36921efd023f9ecaac4cd3fb8a16d200abd
 SHA1 (patch-include_my_pthread.h) = ff3bf1fddd04edd7804d810f79de64387464b5ca
 SHA1 (patch-include_myisam.h) = c554a594ea0169cb725cfdfe5accaf231eebdc23
-SHA1 (patch-libmysql_CMakeLists.txt) = 6169cb9f88e4022b83b3d9103b1f8e80ad8143d8
+SHA1 (patch-libmysql_CMakeLists.txt) = fbb012525eb90d4f171d6fa63ed4343bbb02d2d3
 SHA1 (patch-libmysql_libmysql.c) = ad78143ca78b7c512e86677b3dd59e497357f289
 SHA1 (patch-libmysqld_lib__sql.cc) = ffdd74cece2d7795cb4d8d738f81c2c8dc040a7d
 SHA1 (patch-mysql-test_CMakeLists.txt) = b7dd562d55678b13ac487aa0ee59bf2551af1f9d
@@ -30,11 +30,11 @@ SHA1 (patch-sql-common_client.c) = f9ecb9bb381d44ca8b551a27150fc40da887a5e9
 SHA1 (patch-sql_CMakeLists.txt) = 83c1e50de6b53a0af5ff010f248dd595745b3eb5
 SHA1 (patch-sql_event__db__repository.cc) = 7a7f95b9db61c690aa6edf55503311a13def59ec
 SHA1 (patch-sql_field.cc) = 54bd0505251714d18840c79260a18dec92fd3d23
-SHA1 (patch-sql_field.h) = bf0d326ffb0ddf6ce31d962c2ddb1cde5042697d
+SHA1 (patch-sql_field.h) = 4b337a623bf1b63190ffa1dfb5575fd32e01825a
 SHA1 (patch-sql_field__conv.cc) = 10847e2fc2b7bb078b125877ffd9efbbc2ba6b28
 SHA1 (patch-sql_ha__ndbcluster.cc) = f46816ab5437ef4b2618e83dc6efa6009acf5167
 SHA1 (patch-sql_ha__partition.cc) = 712dfefe65f6671c3c834ab07111f828b44b9b92
-SHA1 (patch-sql_handler.cc) = e41db8bfae19a7638048ccc37a9f9511f4304b35
+SHA1 (patch-sql_handler.cc) = 7d4dc521c9c8d63148c412d04e1446025dcbf4bd
 SHA1 (patch-sql_handler.h) = e45c9fab750910ef7f02a714c1a4684303cb05a0
 SHA1 (patch-sql_item.cc) = cf523f4377788ca2342d6913f22e6e2be21e7b94
 SHA1 (patch-sql_item.h) = 8b8be81418254aac383464e9b358268343a9a55d
@@ -78,7 +78,7 @@ SHA1 (patch-sql_sql__load.cc) = 2deaed8591f8de74c785551e25c446f1495f6761
 SHA1 (patch-sql_sql__optimizer.cc) = 0dd2fbe662fb9f5295fdc5f56b5bb31e21ef2b6e
 SHA1 (patch-sql_sql__optimizer.h) = 6104052027b9270540a7050d546a0d013ae86b8c
 SHA1 (patch-sql_sql__parse.cc) = 762aa7c8f535cfc31d0af64d8398bf45b83a01f2
-SHA1 (patch-sql_sql__partition.cc) = af69c918da14566b45beb757902b03b83aa8e36f
+SHA1 (patch-sql_sql__partition.cc) = cf44a45c08bab81bc7a19673295aa4552c633021
 SHA1 (patch-sql_sql__planner.cc) = f3540275174e4ab68950c579d424a2bc118eb292
 SHA1 (patch-sql_sql__prepare.cc) = 886ee8ca5863704ddf172eb746c092f308e6ca1c
 SHA1 (patch-sql_sql__prepare.h) = 30b520b1dea2b8d8225c528ba58b9231d94a85dd
diff --git a/databases/mysql56-client/patches/patch-libmysql_CMakeLists.txt b/databases/mysql56-client/patches/patch-libmysql_CMakeLists.txt
index 3f6decfbcdc..8e89a3e8d48 100644
--- a/databases/mysql56-client/patches/patch-libmysql_CMakeLists.txt
+++ b/databases/mysql56-client/patches/patch-libmysql_CMakeLists.txt
@@ -1,16 +1,16 @@
-$NetBSD: patch-libmysql_CMakeLists.txt,v 1.1 2013/07/15 12:13:43 ryoon Exp $
+$NetBSD: patch-libmysql_CMakeLists.txt,v 1.2 2013/07/31 09:51:38 adam Exp $
 
 * Generate libmysqlclient.so.18.0.0 file and libmysqlclient_r.so.18.0.0 symlink
   on FreeBSD to supress PLIST divergence.
 
---- libmysql/CMakeLists.txt.orig	2013-05-21 15:18:39.000000000 +0000
+--- libmysql/CMakeLists.txt.orig	2013-07-10 16:17:29.000000000 +0000
 +++ libmysql/CMakeLists.txt
-@@ -203,7 +203,7 @@ IF(NOT DISABLE_SHARED)
+@@ -215,7 +215,7 @@ IF(NOT DISABLE_SHARED)
      COMPONENT SharedLibraries)
    IF(UNIX)
      # libtool compatability
 -    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
 +    IF(CMAKE_SYSTEM_NAME MATCHES APPLE)
        SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
-     ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
-       SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0")
+     ELSE()
+       SET(OS_SHARED_LIB_VERSION
diff --git a/databases/mysql56-client/patches/patch-sql_field.h b/databases/mysql56-client/patches/patch-sql_field.h
index 1ed62d43cd5..72b6c502104 100644
--- a/databases/mysql56-client/patches/patch-sql_field.h
+++ b/databases/mysql56-client/patches/patch-sql_field.h
@@ -1,8 +1,13 @@
-$NetBSD: patch-sql_field.h,v 1.1 2013/05/06 14:41:08 joerg Exp $
+$NetBSD: patch-sql_field.h,v 1.2 2013/07/31 09:51:38 adam Exp $
 
---- sql/field.h.orig	2013-05-05 20:53:17.000000000 +0000
+--- sql/field.h.orig	2013-07-10 16:17:27.000000000 +0000
 +++ sql/field.h
-@@ -887,10 +887,10 @@ public:
+@@ -891,14 +891,14 @@ public:
+ 
+     */
+     return real_maybe_null() ?
+-      test(null_ptr[row_offset] & null_bit) : table->null_row;
++      my_test(null_ptr[row_offset] & null_bit) : table->null_row;
    }
  
    bool is_real_null(my_ptrdiff_t row_offset= 0) const
@@ -15,7 +20,7 @@ $NetBSD: patch-sql_field.h,v 1.1 2013/05/06 14:41:08 joerg Exp $
  
    void set_null(my_ptrdiff_t row_offset= 0)
    {
-@@ -3652,9 +3652,9 @@ public:
+@@ -3670,9 +3670,9 @@ public:
    {
      DBUG_ASSERT(ptr == a || ptr == b);
      if (ptr == a)
diff --git a/databases/mysql56-client/patches/patch-sql_handler.cc b/databases/mysql56-client/patches/patch-sql_handler.cc
index ef9413912de..d4405f74365 100644
--- a/databases/mysql56-client/patches/patch-sql_handler.cc
+++ b/databases/mysql56-client/patches/patch-sql_handler.cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-sql_handler.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $
+$NetBSD: patch-sql_handler.cc,v 1.2 2013/07/31 09:51:38 adam Exp $
 
---- sql/handler.cc.orig	2013-05-05 20:55:20.000000000 +0000
+--- sql/handler.cc.orig	2013-07-10 16:17:27.000000000 +0000
 +++ sql/handler.cc
-@@ -5722,7 +5722,7 @@ handler::multi_range_read_init(RANGE_SEQ
+@@ -5737,7 +5737,7 @@ handler::multi_range_read_init(RANGE_SEQ
    DBUG_ENTER("handler::multi_range_read_init");
    mrr_iter= seq_funcs->init(seq_init_param, n_ranges, mode);
    mrr_funcs= *seq_funcs;
@@ -11,7 +11,7 @@ $NetBSD: patch-sql_handler.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $
    mrr_have_range= FALSE;
    DBUG_RETURN(0);
  }
-@@ -5778,7 +5778,7 @@ scan_it_again:
+@@ -5793,7 +5793,7 @@ scan_it_again:
                                   &mrr_cur_range.start_key : 0,
                                 mrr_cur_range.end_key.keypart_map ?
                                   &mrr_cur_range.end_key : 0,
@@ -20,7 +20,7 @@ $NetBSD: patch-sql_handler.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $
                                 mrr_is_output_sorted);
        if (result != HA_ERR_END_OF_FILE)
          break;
-@@ -5875,7 +5875,7 @@ int DsMrr_impl::dsmrr_init(handler *h_ar
+@@ -5890,7 +5890,7 @@ int DsMrr_impl::dsmrr_init(handler *h_ar
  
    rowids_buf= buf->buffer;
  
@@ -29,7 +29,7 @@ $NetBSD: patch-sql_handler.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $
  
    if (is_mrr_assoc)
      status_var_increment(table->in_use->status_var.ha_multi_range_read_init_count);
-@@ -6113,7 +6113,7 @@ int DsMrr_impl::dsmrr_fill_buffer()
+@@ -6128,7 +6128,7 @@ int DsMrr_impl::dsmrr_fill_buffer()
  
    if (res && res != HA_ERR_END_OF_FILE)
      DBUG_RETURN(res); 
@@ -38,16 +38,16 @@ $NetBSD: patch-sql_handler.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $
  
    /* Sort the buffer contents by rowid */
    uint elem_size= h->ref_length + (int)is_mrr_assoc * sizeof(void*);
-@@ -6166,7 +6166,7 @@ int DsMrr_impl::dsmrr_next(char **range_
+@@ -6181,7 +6181,7 @@ int DsMrr_impl::dsmrr_next(char **range_
      if (is_mrr_assoc)
-       memcpy(&cur_range_info, rowids_buf_cur + h->ref_length, sizeof(uchar**));
+       memcpy(&cur_range_info, rowids_buf_cur + h->ref_length, sizeof(uchar*));
  
 -    rowids_buf_cur += h->ref_length + sizeof(void*) * test(is_mrr_assoc);
 +    rowids_buf_cur += h->ref_length + sizeof(void*) * my_test(is_mrr_assoc);
      if (h2->mrr_funcs.skip_record &&
  	h2->mrr_funcs.skip_record(h2->mrr_iter, (char *) cur_range_info, rowid))
        continue;
-@@ -6388,7 +6388,7 @@ bool DsMrr_impl::get_disk_sweep_mrr_cost
+@@ -6403,7 +6403,7 @@ bool DsMrr_impl::get_disk_sweep_mrr_cost
    double index_read_cost;
  
    const uint elem_size= h->ref_length + 
diff --git a/databases/mysql56-client/patches/patch-sql_sql__partition.cc b/databases/mysql56-client/patches/patch-sql_sql__partition.cc
index 32f08c806a8..8ee7aa1503a 100644
--- a/databases/mysql56-client/patches/patch-sql_sql__partition.cc
+++ b/databases/mysql56-client/patches/patch-sql_sql__partition.cc
@@ -1,17 +1,8 @@
-$NetBSD: patch-sql_sql__partition.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $
+$NetBSD: patch-sql_sql__partition.cc,v 1.2 2013/07/31 09:51:38 adam Exp $
 
---- sql/sql_partition.cc.orig	2013-05-05 20:56:04.000000000 +0000
+--- sql/sql_partition.cc.orig	2013-07-10 16:17:27.000000000 +0000
 +++ sql/sql_partition.cc
-@@ -3294,7 +3294,7 @@ uint32 get_partition_id_cols_list_for_en
-     }
-     else 
-     {
--      DBUG_RETURN(list_index + test(!tailf));
-+      DBUG_RETURN(list_index + my_test(!tailf));
-     }
-   } while (max_list_index >= min_list_index);
-   if (cmp > 0)
-@@ -3370,7 +3370,7 @@ uint32 get_list_array_idx_for_endpoint(p
+@@ -3377,7 +3377,7 @@ uint32 get_list_array_idx_for_endpoint(p
      }
      else 
      {
@@ -20,7 +11,7 @@ $NetBSD: patch-sql_sql__partition.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $
      }
    } while (max_list_index >= min_list_index);
  notfound:
-@@ -5846,7 +5846,7 @@ static bool mysql_change_partitions(ALTE
+@@ -5853,7 +5853,7 @@ static bool mysql_change_partitions(ALTE
    if (mysql_trans_commit_alter_copy_data(thd))
      error= 1;                                /* The error has been reported */
  
@@ -29,16 +20,7 @@ $NetBSD: patch-sql_sql__partition.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $
  }
  
  
-@@ -7720,7 +7720,7 @@ uint32 get_partition_id_cols_range_for_e
-                                        loc_part_id * num_columns,
-                                        nparts, tailf);
-       if (!res)
--        loc_part_id += test(include_endpoint);
-+        loc_part_id += my_test(include_endpoint);
-       else if (res > 0)
-         loc_part_id++;
-     }
-@@ -7902,7 +7902,7 @@ int get_part_iter_for_interval_via_mappi
+@@ -7967,7 +7967,7 @@ int get_part_iter_for_interval_via_mappi
          index-in-ordered-array-of-list-constants (for LIST) space.
        */
        store_key_image_to_rec(field, min_value, field_len);
@@ -47,7 +29,7 @@ $NetBSD: patch-sql_sql__partition.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $
        part_iter->part_nums.start= get_endpoint(part_info, 1, include_endp);
        if (!can_match_multiple_values && part_info->part_expr->null_value)
        {
-@@ -7937,7 +7937,7 @@ int get_part_iter_for_interval_via_mappi
+@@ -8002,7 +8002,7 @@ int get_part_iter_for_interval_via_mappi
    else
    {
      store_key_image_to_rec(field, max_value, field_len);
@@ -56,7 +38,7 @@ $NetBSD: patch-sql_sql__partition.cc,v 1.1 2013/05/06 14:41:08 joerg Exp $
      part_iter->part_nums.end= get_endpoint(part_info, 0, include_endp);
      if (check_zero_dates &&
          !zero_in_start_date &&
-@@ -8104,8 +8104,8 @@ int get_part_iter_for_interval_via_walki
+@@ -8169,8 +8169,8 @@ int get_part_iter_for_interval_via_walki
    if ((ulonglong)b - (ulonglong)a == ~0ULL)
      DBUG_RETURN(-1);
  
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index 509c1345262..8c3b0acd2c8 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2013/07/15 02:02:19 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2013/07/31 09:51:38 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	1
 SVR4_PKGNAME=	mysqs
 COMMENT=	MySQL 5, a free SQL database (server)
 
@@ -86,6 +85,5 @@ CXXFLAGS+=		-D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
 
 BUILDLINK_AUTO_DIRS.mysql-client=	no
 .include "../../databases/mysql56-client/buildlink3.mk"
-.include "../../mk/readline.buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql56-server/PLIST b/databases/mysql56-server/PLIST
index e29ada97859..f7e780fcf04 100644
--- a/databases/mysql56-server/PLIST
+++ b/databases/mysql56-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2013/06/04 18:17:25 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/07/31 09:51:38 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -185,11 +185,14 @@ share/mysql/test/README.stress
 share/mysql/test/collections/README
 share/mysql/test/collections/README.experimental
 share/mysql/test/collections/default.daily
+share/mysql/test/collections/default.daily-valgrind
 share/mysql/test/collections/default.experimental
 share/mysql/test/collections/default.push
+share/mysql/test/collections/default.push-valgrind
 share/mysql/test/collections/default.release
 share/mysql/test/collections/default.release.done
 share/mysql/test/collections/default.weekly
+share/mysql/test/collections/default.weekly-valgrind
 share/mysql/test/collections/disabled-daily.list
 share/mysql/test/collections/disabled-gtid-on.list
 share/mysql/test/collections/disabled-per-push.list
@@ -428,6 +431,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_daemon_example_plugin.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
@@ -606,6 +610,7 @@ share/mysql/test/include/read_many_rows.inc
 share/mysql/test/include/relocate_binlogs.inc
 share/mysql/test/include/report-features.test
 share/mysql/test/include/restart_mysqld.inc
+share/mysql/test/include/restart_readonly_mysqld.inc
 share/mysql/test/include/restart_slave_sql.inc
 share/mysql/test/include/rowid_order.inc
 share/mysql/test/include/rpl_change_topology.inc
@@ -3756,6 +3761,7 @@ share/mysql/test/suite/innodb_fts/r/innodb_fts_multiple_index.result
 share/mysql/test/suite/innodb_fts/r/innodb_fts_opt.result
 share/mysql/test/suite/innodb_fts/r/innodb_fts_plugin.result
 share/mysql/test/suite/innodb_fts/r/innodb_fts_proximity.result
+share/mysql/test/suite/innodb_fts/r/innodb_fts_result_cache_limit.result
 share/mysql/test/suite/innodb_fts/r/innodb_fts_stopword_charset.result
 share/mysql/test/suite/innodb_fts/r/innodb_fts_transaction.result
 share/mysql/test/suite/innodb_fts/t/disabled.def
@@ -3784,6 +3790,7 @@ share/mysql/test/suite/innodb_fts/t/innodb_fts_multiple_index.test
 share/mysql/test/suite/innodb_fts/t/innodb_fts_opt.test
 share/mysql/test/suite/innodb_fts/t/innodb_fts_plugin.test
 share/mysql/test/suite/innodb_fts/t/innodb_fts_proximity.test
+share/mysql/test/suite/innodb_fts/t/innodb_fts_result_cache_limit.test
 share/mysql/test/suite/innodb_fts/t/innodb_fts_stopword_charset.test
 share/mysql/test/suite/innodb_fts/t/innodb_fts_transaction.test
 share/mysql/test/suite/jp/include/trim_sjis.inc
@@ -5116,6 +5123,8 @@ share/mysql/test/suite/perfschema/include/connection_setup.inc
 share/mysql/test/suite/perfschema/include/digest_cleanup.inc
 share/mysql/test/suite/perfschema/include/digest_execution.inc
 share/mysql/test/suite/perfschema/include/digest_setup.inc
+share/mysql/test/suite/perfschema/include/disable_instruments.inc
+share/mysql/test/suite/perfschema/include/enable_instruments.inc
 share/mysql/test/suite/perfschema/include/event_aggregate_cleanup.inc
 share/mysql/test/suite/perfschema/include/event_aggregate_load.inc
 share/mysql/test/suite/perfschema/include/event_aggregate_setup.inc
@@ -5124,6 +5133,7 @@ share/mysql/test/suite/perfschema/include/hostcache_dump.inc
 share/mysql/test/suite/perfschema/include/hostcache_set_state.inc
 share/mysql/test/suite/perfschema/include/no_protocol.inc
 share/mysql/test/suite/perfschema/include/privilege.inc
+share/mysql/test/suite/perfschema/include/rpl_statements_truncate.inc
 share/mysql/test/suite/perfschema/include/schema.inc
 share/mysql/test/suite/perfschema/include/setup_helper.inc
 share/mysql/test/suite/perfschema/include/sizing_auto.inc
@@ -5347,6 +5357,7 @@ share/mysql/test/suite/perfschema/r/read_only.result
 share/mysql/test/suite/perfschema/r/relaylog.result
 share/mysql/test/suite/perfschema/r/rollback_table_io.result
 share/mysql/test/suite/perfschema/r/rpl_gtid_func.result
+share/mysql/test/suite/perfschema/r/rpl_statements.result
 share/mysql/test/suite/perfschema/r/schema.result
 share/mysql/test/suite/perfschema/r/selects.result
 share/mysql/test/suite/perfschema/r/server_init.result
@@ -5704,6 +5715,9 @@ share/mysql/test/suite/perfschema/t/relaylog-slave.opt
 share/mysql/test/suite/perfschema/t/relaylog.test
 share/mysql/test/suite/perfschema/t/rollback_table_io.test
 share/mysql/test/suite/perfschema/t/rpl_gtid_func.test
+share/mysql/test/suite/perfschema/t/rpl_statements-master.opt
+share/mysql/test/suite/perfschema/t/rpl_statements-slave.opt
+share/mysql/test/suite/perfschema/t/rpl_statements.test
 share/mysql/test/suite/perfschema/t/schema.test
 share/mysql/test/suite/perfschema/t/selects-master.opt
 share/mysql/test/suite/perfschema/t/selects.test
@@ -6352,7 +6366,6 @@ share/mysql/test/suite/rpl/t/rpl_change_master_crash_safe.test
 share/mysql/test/suite/rpl/t/rpl_change_master_dbug.test
 share/mysql/test/suite/rpl/t/rpl_charset.test
 share/mysql/test/suite/rpl/t/rpl_charset_sjis.test
-share/mysql/test/suite/rpl/t/rpl_check_gtid-slave.opt
 share/mysql/test/suite/rpl/t/rpl_check_gtid.test
 share/mysql/test/suite/rpl/t/rpl_checksum-master.opt
 share/mysql/test/suite/rpl/t/rpl_checksum.test
@@ -7201,8 +7214,10 @@ share/mysql/test/suite/sys_vars/r/innodb_ft_enable_stopword_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_ft_max_token_size_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_ft_min_token_size_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_ft_num_word_optimize_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_ft_result_cache_limit_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_ft_server_stopword_table_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_ft_sort_pll_degree_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_ft_total_cache_size_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_ft_user_stopword_table_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_io_capacity_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_io_capacity_max_basic.result
@@ -7485,6 +7500,7 @@ share/mysql/test/suite/sys_vars/r/rpl_semi_sync_master_trace_level_basic.result
 share/mysql/test/suite/sys_vars/r/rpl_semi_sync_master_wait_no_slave_basic.result
 share/mysql/test/suite/sys_vars/r/rpl_semi_sync_slave_enabled_basic.result
 share/mysql/test/suite/sys_vars/r/rpl_semi_sync_slave_trace_level_basic.result
+share/mysql/test/suite/sys_vars/r/rpl_stop_slave_timeout_basic.result
 share/mysql/test/suite/sys_vars/r/secure_auth_basic.result
 share/mysql/test/suite/sys_vars/r/secure_auth_func.result
 share/mysql/test/suite/sys_vars/r/secure_file_priv.result
@@ -7799,8 +7815,10 @@ share/mysql/test/suite/sys_vars/t/innodb_ft_enable_stopword_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_ft_max_token_size_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_ft_min_token_size_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_ft_num_word_optimize_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_ft_result_cache_limit_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_ft_server_stopword_table_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_ft_sort_pll_degree_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_ft_total_cache_size_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_ft_user_stopword_table_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_io_capacity_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_io_capacity_max_basic.test
@@ -8130,6 +8148,7 @@ share/mysql/test/suite/sys_vars/t/rpl_semi_sync_slave_enabled_basic-master.opt
 share/mysql/test/suite/sys_vars/t/rpl_semi_sync_slave_enabled_basic.test
 share/mysql/test/suite/sys_vars/t/rpl_semi_sync_slave_trace_level_basic-master.opt
 share/mysql/test/suite/sys_vars/t/rpl_semi_sync_slave_trace_level_basic.test
+share/mysql/test/suite/sys_vars/t/rpl_stop_slave_timeout_basic.test
 share/mysql/test/suite/sys_vars/t/secure_auth_basic.test
 share/mysql/test/suite/sys_vars/t/secure_auth_func-master.opt
 share/mysql/test/suite/sys_vars/t/secure_auth_func.test