Index: head/databases/mysql80-client/files/patch-client_CMakeLists.txt
===================================================================
--- head/databases/mysql80-client/files/patch-client_CMakeLists.txt	(revision 501260)
+++ head/databases/mysql80-client/files/patch-client_CMakeLists.txt	(revision 501261)
@@ -1,36 +1,38 @@
---- client/CMakeLists.txt.orig	2016-08-25 12:32:09 UTC
-+++ client/CMakeLists.txt
-@@ -47,6 +47,7 @@ IF(UNIX)
+--- client/CMakeLists.txt.orig	2019-04-13 13:46:31.000000000 +0200
++++ client/CMakeLists.txt	2019-04-30 00:27:10.627236000 +0200
+@@ -35,10 +35,12 @@
    TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
  ENDIF(UNIX)
  
 +IF(FALSE)
  IF(NOT WITHOUT_SERVER)
-   MYSQL_ADD_EXECUTABLE(mysql_upgrade
-     upgrade/program.cc
-@@ -57,11 +58,14 @@ ADD_COMPILE_FLAGS(
-   TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
-   ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema GenBootstrapPriv)
+   MYSQL_ADD_EXECUTABLE(mysql_upgrade upgrade/program.cc)
+   TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base)
  ENDIF()
 +ENDIF()
  
  SET(MYSQLTEST_SRC
-   mysqltest/mysqltest_expected_error.cc
+   mysqltest/error_names.cc
+@@ -48,9 +50,11 @@
+   mysqltest/utils.cc
  )
  
 +IF(FALSE)
  MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc ${MYSQLTEST_SRC} COMPONENT Test)
- TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
+ TARGET_LINK_LIBRARIES(mysqltest mysqlclient)
  ADD_DEPENDENCIES(mysqltest GenError GenClientError)
 +ENDIF()
-@@ -113,8 +117,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
+ 
+ ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
+ TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
+@@ -108,8 +112,10 @@
  MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
  TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
  
 +IF(FALSE)
  MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
  TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
 +ENDIF()
  
  MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc)
  TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl)
Index: head/databases/mysql80-client/files/patch-include_CMakeLists.txt
===================================================================
--- head/databases/mysql80-client/files/patch-include_CMakeLists.txt	(revision 501260)
+++ head/databases/mysql80-client/files/patch-include_CMakeLists.txt	(revision 501261)
@@ -1,176 +1,176 @@
 --- include/CMakeLists.txt.orig	2017-09-21 15:51:58 UTC
 +++ include/CMakeLists.txt
 @@ -30,11 +30,173 @@ SET(HEADERS
    ${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h
    ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h
-   ../libbinlogevents/export/binary_log_types.h
+   field_types.h
 +  base64.h
 +  big_endian.h
 +  c_string_less.h
 +  crypt_genhash_impl.h
 +  decimal.h
 +  depth_first_search.h
 +  dur_prop.h
 +  errmsg.h
 +  ft_global.h
 +  heap.h
 +  keycache.h
 +  lex_string.h
 +  lf.h
 +  little_endian.h
 +  m_ctype.h
 +  m_string.h
 +  map_helpers.h
 +  mf_wcomp.h
 +  mutex_lock.h
 +  my_aes.h
 +  my_alloc.h
 +  my_atomic.h
 +  my_base.h
 +  my_bit.h
 +  my_bitmap.h
 +  my_byteorder.h
 +  my_check_opt.h
 +  my_command.h
 +  my_compare.h
 +  my_compare.h.orig
 +  my_compiler.h
 +  my_dbug.h
 +  my_default.h
 +  my_dir.h
 +  my_double2ulonglong.h
 +  my_getopt.h
 +  my_hash_combine.h
 +  my_icp.h
 +  my_inttypes.h
 +  my_io.h
 +  my_list.h
 +  my_loglevel.h
 +  my_macros.h
 +  my_md5.h
 +  my_md5_size.h
 +  my_murmur3.h
 +  my_pointer_arithmetic.h
 +  my_psi_config.h
 +  my_rapidjson_size_t.h
 +  my_rdtsc.h
 +  my_rnd.h
 +  my_sharedlib.h
 +  my_shm_defaults.h
 +  my_sqlcommand.h
 +  my_stacktrace.h
 +  my_sys.h
 +  my_systime.h
 +  my_table_map.h
 +  my_thread.h
 +  my_thread_local.h
 +  my_thread_os_id.h
 +  my_time.h
 +  my_timer.h
 +  my_tree.h
 +  my_uctype.h
 +  my_user.h
 +  my_xml.h
 +  myisam.h
 +  myisammrg.h
 +  myisampack.h
 +  mysql.h
 +  mysql.h.pp
 +  mysql_com.h
 +  mysql_com_server.h
 +  mysql_time.h
 +  mysql_version.h.in
 +  mysys_err.h
 +  nullable.h
 +  password.h
 +  pfs_cond_provider.h
 +  pfs_error_provider.h
 +  pfs_file_provider.h
 +  pfs_idle_provider.h
 +  pfs_memory_provider.h
 +  pfs_metadata_provider.h
 +  pfs_mutex_provider.h
 +  pfs_rwlock_provider.h
 +  pfs_socket_provider.h
 +  pfs_stage_provider.h
 +  pfs_statement_provider.h
 +  pfs_table_provider.h
 +  pfs_thread_provider.h
 +  pfs_transaction_provider.h
 +  prealloced_array.h
 +  print_version.h
 +  priority_queue.h
 +  rwlock_scoped_lock.h
 +  scope_guard.h
 +  service_versions.h
 +  sha1.h
 +  sha2.h
 +  sql_chars.h
 +  sql_common.h
 +  sql_string.h
 +  sslopt-case.h
 +  sslopt-longopts.h
 +  sslopt-vars.h
 +  template_utils.h
 +  thr_cond.h
 +  thr_lock.h
 +  thr_mutex.h
 +  thr_rwlock.h
 +  typelib.h
 +  varlen_sort.h
 +  violite.h
 +  welcome_copyright_notice.h
  )
  SET(HEADERS_MYSQL_DIR
    mysql/client_plugin.h
    mysql/plugin_auth_common.h
    mysql/udf_registration_types.h
 +  mysql/client_authentication.h
 +  mysql/client_plugin.h.pp
 +  mysql/com_data.h
 +  mysql/get_password.h
 +  mysql/group_replication_priv.h
 +  mysql/innodb_priv.h
 +  mysql/mysql_lex_string.h
 +  mysql/plugin.h
 +  mysql/plugin_audit.h
 +  mysql/plugin_audit.h.pp
 +  mysql/plugin_auth.h
 +  mysql/plugin_auth.h.pp
 +  mysql/plugin_auth_common.h
 +  mysql/plugin_ftparser.h
 +  mysql/plugin_ftparser.h.pp
 +  mysql/plugin_group_replication.h
 +  mysql/plugin_keyring.h
 +  mysql/plugin_keyring.h.pp
 +  mysql/plugin_query_rewrite.h
 +  mysql/plugin_trace.h
 +  mysql/plugin_validate_password.h
 +  mysql/service_command.h
 +  mysql/service_locking.h
 +  mysql/service_my_plugin_log.h
 +  mysql/service_mysql_alloc.h
 +  mysql/service_mysql_keyring.h
 +  mysql/service_mysql_password_policy.h
 +  mysql/service_mysql_string.h
 +  mysql/service_parser.h
 +  mysql/service_plugin_registry.h
 +  mysql/service_rpl_transaction_ctx.h
 +  mysql/service_rpl_transaction_write_set.h
 +  mysql/service_rules_table.h
 +  mysql/service_security_context.h
 +  mysql/service_srv_session.h
 +  mysql/service_srv_session_info.h
 +  mysql/service_ssl_wrapper.h
 +  mysql/service_thd_alloc.h
 +  mysql/service_thd_engine_lock.h
 +  mysql/service_thd_wait.h
 +  mysql/service_thread_scheduler.h
 +  mysql/services.h
 +  mysql/services.h.pp
 +  mysql/thread_pool_priv.h
 +  mysql/thread_type.h
 +  mysql/udf_registration_types.h
  )
  
  INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
Index: head/databases/mysql80-client/files/patch-scripts_CMakeLists.txt
===================================================================
--- head/databases/mysql80-client/files/patch-scripts_CMakeLists.txt	(revision 501260)
+++ head/databases/mysql80-client/files/patch-scripts_CMakeLists.txt	(revision 501261)
@@ -1,73 +1,73 @@
 --- scripts/CMakeLists.txt.orig	2018-10-07 08:44:22 UTC
 +++ scripts/CMakeLists.txt
 @@ -80,6 +80,7 @@ ELSE()
    MESSAGE(FATAL_ERROR "Cannot concatenate files")
  ENDIF()
  
 +IF(FALSE)
- # Build mysql_fix_privilege_tables.c
+ # Build mysql_fix_privilege_tables.h
  ADD_CUSTOM_COMMAND(
-   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
+   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.h
 @@ -100,6 +101,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs
-   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
+   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.h
    ${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h
  )
 +ENDIF()
  
  # If we do not have performance schema compiled in then sys will not work,
  # so only create an empty sys database with an auto-generated file,
 @@ -204,6 +206,7 @@ IF(NOT WITHOUT_SERVER)
    )
  ENDIF()
  
 +IF(FALSE)
  IF(UNIX)
   FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
     "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" )
 @@ -211,6 +214,7 @@ IF(UNIX)
    COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
  )
  ENDIF()
 +ENDIF()
  
  # TCMalloc hacks
  IF(MALLOC_LIB)
 @@ -364,7 +368,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
      LIST(REMOVE_DUPLICATES ${target}_LIB_DEPENDS)
      FOREACH(lib ${${target}_LIB_DEPENDS})
        # Filter out "general", it is not a library, just CMake hint
 -      IF(NOT lib STREQUAL "general" AND NOT ${var}  MATCHES "-l${lib} ")
 +      IF(NOT lib STREQUAL "general" AND NOT ${var}  MATCHES "-l${lib} " AND NOT lib STREQUAL "imported_openssl" AND NOT lib STREQUAL "imported_crypto")
          IF (lib MATCHES "^\\-l")
            SET(${var} "${${var}} ${lib} ")
          ELSEIF(lib MATCHES "^/")
 @@ -372,6 +376,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
            GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
            STRING(REGEX REPLACE "^lib" "" lib "${lib}")
            SET(${var} "${${var}}-l${lib} " )
 +        ELSEIF(lib STREQUAL "-pthread")
 +          SET(${var} "${${var}}-pthread " )
          ELSE()
            SET(${var} "${${var}}-l${lib} " )
          ENDIF()
 @@ -454,19 +460,7 @@ ELSE()
    # On Unix, most of the files end up in the bin directory
    SET(mysql_config_COMPONENT COMPONENT Development)
  
 -  IF(WITH_SYSTEMD)
 -    SET(BIN_SCRIPTS
 -      mysql_config
 -      mysqldumpslow
 -      )
 -  ELSE()
 -    SET(BIN_SCRIPTS
 -      mysql_config
 -      mysqldumpslow
 -      mysqld_multi
 -      mysqld_safe
 -      )
 -  ENDIF()
 +  SET(BIN_SCRIPTS mysql_config)
  
    SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc)
    STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}")
Index: head/databases/mysql80-client/files/patch-sql_mysqld.cc
===================================================================
--- head/databases/mysql80-client/files/patch-sql_mysqld.cc	(revision 501260)
+++ head/databases/mysql80-client/files/patch-sql_mysqld.cc	(revision 501261)
@@ -1,20 +1,11 @@
 --- sql/mysqld.cc.orig	2018-05-06 19:15:48 UTC
 +++ sql/mysqld.cc
 @@ -4321,7 +4321,7 @@ static void init_ssl() {
  
- static int init_ssl_communication() {
+ static void init_ssl() {
  #ifdef HAVE_OPENSSL
--#ifndef HAVE_WOLFSSL
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-   char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-   int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string);
-   if (ret_fips_mode != 1) {
-@@ -8647,7 +8647,7 @@ bool mysqld_get_one_option(int optid,
-         One can disable SSL later by using --skip-ssl or --ssl=0.
-       */
-       opt_use_ssl = true;
--#ifdef HAVE_WOLFSSL
-+#if defined(HAVE_WOLFSSL) || defined(LIBRESSL_VERSION_NUMBER)
-       /* crl has no effect in wolfSSL. */
-       opt_ssl_crl = NULL;
-       opt_ssl_crlpath = NULL;
+-#if !defined(HAVE_WOLFSSL) && !defined(__sun)
++#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) && !defined(__sun)
+ #if defined(HAVE_PSI_MEMORY_INTERFACE)
+   static PSI_memory_info all_openssl_memory[] = {
+       {&key_memory_openssl, "openssl_malloc", 0, 0,
Index: head/databases/mysql80-client/files/patch-support-files_CMakeLists.txt
===================================================================
--- head/databases/mysql80-client/files/patch-support-files_CMakeLists.txt	(revision 501260)
+++ head/databases/mysql80-client/files/patch-support-files_CMakeLists.txt	(revision 501261)
@@ -1,23 +1,23 @@
 --- support-files/CMakeLists.txt.orig	2017-06-27 11:44:29 UTC
 +++ support-files/CMakeLists.txt
 @@ -46,6 +46,7 @@ IF(UNIX)
    ELSE()
      SET (PIDOF "pgrep -d' ' -f")
    ENDIF()
 +IF (FALSE)
    SET(prefix ${CMAKE_INSTALL_PREFIX})
    FOREACH(script  mysqld_multi.server mysql-log-rotate)
      CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
-@@ -59,9 +60,12 @@ IF(UNIX)
-   IF(INSTALL_SUPPORTFILESDIR)
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-   ENDIF()
+@@ -63,9 +64,12 @@
+        DESTINATION ${inst_location} COMPONENT ${comp}
+        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+   ENDFOREACH()
 +ENDIF()
 +ENDIF()
  
    INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
    
 +IF (FALSE)
    SET(bindir ${prefix}/${INSTALL_BINDIR})
    SET(sbindir ${prefix}/${INSTALL_SBINDIR})
    SET(libexecdir ${prefix}/${INSTALL_SBINDIR})
Index: head/databases/mysql80-client/pkg-plist
===================================================================
--- head/databases/mysql80-client/pkg-plist	(revision 501260)
+++ head/databases/mysql80-client/pkg-plist	(revision 501261)
@@ -1,196 +1,196 @@
 bin/mysql
 bin/mysql_config
 bin/mysql_config_editor
 bin/mysql_ssl_rsa_setup
 bin/mysqladmin
 bin/mysqlbinlog
 bin/mysqlcheck
 bin/mysqldump
 bin/mysqlimport
 bin/mysqlpump
 bin/mysqlshow
 bin/mysqlslap
 include/mysql/base64.h
 include/mysql/big_endian.h
-include/mysql/binary_log_types.h
 include/mysql/c_string_less.h
 include/mysql/crypt_genhash_impl.h
 include/mysql/decimal.h
 include/mysql/depth_first_search.h
 include/mysql/dur_prop.h
 include/mysql/errmsg.h
+include/mysql/field_types.h
 include/mysql/ft_global.h
 include/mysql/heap.h
 include/mysql/keycache.h
 include/mysql/lex_string.h
 include/mysql/lf.h
 include/mysql/little_endian.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
 include/mysql/map_helpers.h
 include/mysql/mf_wcomp.h
 include/mysql/mutex_lock.h
 include/mysql/my_aes.h
 include/mysql/my_alloc.h
 include/mysql/my_atomic.h
 include/mysql/my_base.h
 include/mysql/my_bit.h
 include/mysql/my_bitmap.h
 include/mysql/my_byteorder.h
 include/mysql/my_check_opt.h
 include/mysql/my_command.h
 include/mysql/my_compare.h
 include/mysql/my_compiler.h
 include/mysql/my_dbug.h
 include/mysql/my_default.h
 include/mysql/my_dir.h
 include/mysql/my_double2ulonglong.h
 include/mysql/my_getopt.h
 include/mysql/my_hash_combine.h
 include/mysql/my_icp.h
 include/mysql/my_inttypes.h
 include/mysql/my_io.h
 include/mysql/my_list.h
 include/mysql/my_loglevel.h
 include/mysql/my_macros.h
 include/mysql/my_md5.h
 include/mysql/my_md5_size.h
 include/mysql/my_murmur3.h
 include/mysql/my_pointer_arithmetic.h
 include/mysql/my_psi_config.h
 include/mysql/my_rapidjson_size_t.h
 include/mysql/my_rdtsc.h
 include/mysql/my_rnd.h
 include/mysql/my_sharedlib.h
 include/mysql/my_shm_defaults.h
 include/mysql/my_sqlcommand.h
 include/mysql/my_stacktrace.h
 include/mysql/my_sys.h
 include/mysql/my_systime.h
 include/mysql/my_table_map.h
 include/mysql/my_thread.h
 include/mysql/my_thread_local.h
 include/mysql/my_thread_os_id.h
 include/mysql/my_time.h
 include/mysql/my_timer.h
 include/mysql/my_tree.h
 include/mysql/my_uctype.h
 include/mysql/my_user.h
 include/mysql/my_xml.h
 include/mysql/myisam.h
 include/mysql/myisammrg.h
 include/mysql/myisampack.h
 include/mysql/mysql.h
 include/mysql/mysql.h.pp
 include/mysql/mysql/client_authentication.h
 include/mysql/mysql/client_plugin.h
 include/mysql/mysql/client_plugin.h.pp
 include/mysql/mysql/com_data.h
 include/mysql/mysql/get_password.h
 include/mysql/mysql/group_replication_priv.h
 include/mysql/mysql/innodb_priv.h
 include/mysql/mysql/mysql_lex_string.h
 include/mysql/mysql/plugin.h
 include/mysql/mysql/plugin_audit.h
 include/mysql/mysql/plugin_audit.h.pp
 include/mysql/mysql/plugin_auth.h
 include/mysql/mysql/plugin_auth.h.pp
 include/mysql/mysql/plugin_auth_common.h
 include/mysql/mysql/plugin_ftparser.h
 include/mysql/mysql/plugin_ftparser.h.pp
 include/mysql/mysql/plugin_group_replication.h
 include/mysql/mysql/plugin_keyring.h
 include/mysql/mysql/plugin_keyring.h.pp
 include/mysql/mysql/plugin_query_rewrite.h
 include/mysql/mysql/plugin_trace.h
 include/mysql/mysql/plugin_validate_password.h
 include/mysql/mysql/service_command.h
 include/mysql/mysql/service_locking.h
 include/mysql/mysql/service_my_plugin_log.h
 include/mysql/mysql/service_mysql_alloc.h
 include/mysql/mysql/service_mysql_keyring.h
 include/mysql/mysql/service_mysql_password_policy.h
 include/mysql/mysql/service_mysql_string.h
 include/mysql/mysql/service_parser.h
 include/mysql/mysql/service_plugin_registry.h
 include/mysql/mysql/service_rpl_transaction_ctx.h
 include/mysql/mysql/service_rpl_transaction_write_set.h
 include/mysql/mysql/service_rules_table.h
 include/mysql/mysql/service_security_context.h
 include/mysql/mysql/service_srv_session.h
 include/mysql/mysql/service_srv_session_info.h
 include/mysql/mysql/service_ssl_wrapper.h
 include/mysql/mysql/service_thd_alloc.h
 include/mysql/mysql/service_thd_engine_lock.h
 include/mysql/mysql/service_thd_wait.h
 include/mysql/mysql/service_thread_scheduler.h
 include/mysql/mysql/services.h
 include/mysql/mysql/services.h.pp
 include/mysql/mysql/thread_pool_priv.h
 include/mysql/mysql/thread_type.h
 include/mysql/mysql/udf_registration_types.h
 include/mysql/mysql_com.h
 include/mysql/mysql_com_server.h
 include/mysql/mysql_time.h
 include/mysql/mysql_version.h
 include/mysql/mysql_version.h.in
 include/mysql/mysqld_error.h
 include/mysql/mysys_err.h
 include/mysql/nullable.h
 include/mysql/password.h
 include/mysql/pfs_cond_provider.h
 include/mysql/pfs_error_provider.h
 include/mysql/pfs_file_provider.h
 include/mysql/pfs_idle_provider.h
 include/mysql/pfs_memory_provider.h
 include/mysql/pfs_metadata_provider.h
 include/mysql/pfs_mutex_provider.h
 include/mysql/pfs_rwlock_provider.h
 include/mysql/pfs_socket_provider.h
 include/mysql/pfs_stage_provider.h
 include/mysql/pfs_statement_provider.h
 include/mysql/pfs_table_provider.h
 include/mysql/pfs_thread_provider.h
 include/mysql/pfs_transaction_provider.h
 include/mysql/prealloced_array.h
 include/mysql/print_version.h
 include/mysql/priority_queue.h
 include/mysql/rwlock_scoped_lock.h
 include/mysql/scope_guard.h
 include/mysql/service_versions.h
 include/mysql/sha1.h
 include/mysql/sha2.h
 include/mysql/sql_chars.h
 include/mysql/sql_common.h
 include/mysql/sql_string.h
 include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-vars.h
 include/mysql/template_utils.h
 include/mysql/thr_cond.h
 include/mysql/thr_lock.h
 include/mysql/thr_mutex.h
 include/mysql/thr_rwlock.h
 include/mysql/typelib.h
 include/mysql/varlen_sort.h
 include/mysql/violite.h
 include/mysql/welcome_copyright_notice.h
 lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.so
 lib/mysql/libmysqlclient.so.21
 lib/mysql/libmysqlclient_r.a
 lib/mysql/libmysqlclient_r.so
 lib/mysql/libmysqlclient_r.so.21
 libdata/pkgconfig/mysqlclient.pc
 man/man1/comp_err.1.gz
 man/man1/mysql.1.gz
 man/man1/mysql_config.1.gz
 man/man1/mysql_config_editor.1.gz
 man/man1/mysqladmin.1.gz
 man/man1/mysqlbinlog.1.gz
 man/man1/mysqlcheck.1.gz
 man/man1/mysqldump.1.gz
 man/man1/mysqlimport.1.gz
 man/man1/mysqlshow.1.gz
 man/man1/mysqlslap.1.gz
 share/aclocal/mysql.m4
Index: head/databases/mysql80-server/Makefile
===================================================================
--- head/databases/mysql80-server/Makefile	(revision 501260)
+++ head/databases/mysql80-server/Makefile	(revision 501261)
@@ -1,175 +1,175 @@
 # Created by: Mahdi Mokhtari <mokhi64@gmail.com>
 # $FreeBSD$
 
 PORTNAME?=		mysql
-PORTVERSION=		8.0.15
-PORTREVISION?=		2
+PORTVERSION=		8.0.16
+PORTREVISION?=		0
 CATEGORIES=		databases ipv6
 MASTER_SITES=		MYSQL/MySQL-8.0
 PKGNAMESUFFIX?=		80-server
 DISTNAME=		${PORTNAME}-boost-${PORTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=		mmokhi@FreeBSD.org
 COMMENT?=		Multithreaded SQL database (server)
 
 LICENSE=		GPLv2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX}
 
 SLAVEDIRS=	databases/mysql80-client
 USES=		bison:build cmake:noninja compiler:c++14-lang cpe \
 		libedit localbase perl5 shebangfix ssl
 
 USE_PERL5=	run
 
 MY_DBDIR=	/var/db/mysql
 MY_SECDIR=	/var/db/mysql_secure
 MY_TMPDIR=	/var/db/mysql_tmpdir
 
 LIB_DEPENDS+=	libevent.so:devel/libevent \
 		libicutu.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
 		libre2.so:devel/re2 \
 		libprotobuf.so:devel/protobuf
 
 CMAKE_BUILD_TYPE=	Release
 CFLAGS+=		-fPIC
 
 CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
 		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
 		-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
 		-DINSTALL_DOCDIR="share/doc/mysql" \
 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
 		-DINSTALL_INCLUDEDIR="include/mysql" \
 		-DINSTALL_INFODIR="${INFO_PATH}" \
 		-DINSTALL_LIBDIR="lib/mysql" \
 		-DINSTALL_MANDIR="man" \
 		-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
 		-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
 		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
 		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
 		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
 		-DINSTALL_SBINDIR="libexec" \
 		-DINSTALL_SCRIPTDIR="bin" \
 		-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
 		-DINSTALL_SHAREDIR="share" \
 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
 		-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
 		-DWITH_BOOST="${WRKSRC}/boost" \
 		-DWITH_EDITLINE=system \
 		-DWITH_LIBEVENT=system \
 		-DWITH_LZ4=system \
 		-DWITH_ZLIB=system \
 		-DWITH_ICU=system \
 		-DWITH_RE2=system \
 		-DWITH_PROTOBUF=system \
 		-DBUILD_BUNDLED_ZLIB=0 \
 		-DINSTALL_MYSQLTESTDIR=0
 
 SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
 
 .ifdef USE_MYSQL
 .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
 SUB_LIST=	MY_DBDIR=${MY_DBDIR} \
 		MY_SECDIR=${MY_SECDIR} \
 		MY_TMPDIR=${MY_TMPDIR}
 
 PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
 		MY_SECDIR=${MY_SECDIR} \
 		MY_TMPDIR=${MY_TMPDIR} \
 		MYSQL80_LIBVER=${MYSQL80_LIBVER}
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
 USES+=		mysql:80
 
 CONFLICTS_INSTALL=	mysql8[1-9]-server-* \
 			mysql[0-79][0-9]-server-* \
 			mysqlwsrep* \
 			mariadb[0-9][0-9]-server-* \
 			percona[0-9][0-9]-server-*
 
 USE_RC_SUBR=	mysql-server
 
 SUB_FILES=	my.cnf.sample
 
 USERS=		mysql
 GROUPS=		mysql
 
 USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
 
 MMAN1=		my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
 		mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
 		mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
 		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \
 		mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \
 		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
 
 CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
 
 OPTIONS_GROUP=		STORAGE
 OPTIONS_GROUP_STORAGE=	ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA
 OPTIONS_SUB=		YES
 STORAGE_DESC=		Permissible "Storage Engines" (to compile statically into the server)
 ARCHIVE_DESC=		Compile "Archive Storage" statically in server
 BLACKHOLE_DESC=		Compile "Blackhole Storage" statically in server
 EXAMPLE_DESC=		Compile "Example Storage" statically in server
 FEDERATED_DESC=		Compile "Federated Storage" statically in server
 INNOBASE_DESC=		Compile "InnoDB Storage" statically in server
 PARTITION_DESC=		Compile "Partitioning support Storage" statically in server
 PERFSCHEMA_DESC=	Compile "Performance Schema Storage" statically in server
 
 ARCHIVE_CMAKE_ON=	-DWITH_ARCHIVE_STORAGE_ENGINE=1
 BLACKHOLE_CMAKE_ON=	-DWITH_BLACKHOLE_STORAGE_ENGINE=1
 EXAMPLE_CMAKE_ON=	-DWITH_EXAMPLE_STORAGE_ENGINE=1
 FEDERATED_CMAKE_ON=	-DWITH_FEDERATED_STORAGE_ENGINE=1
 INNOBASE_CMAKE_ON=	-DWITH_INNOBASE_STORAGE_ENGINE=1
 PARTITION_CMAKE_ON=	-DWITH_PARTITION_STORAGE_ENGINE=1
 PERFSCHEMA_CMAKE_ON=	-DWITH_PERFSCHEMA_STORAGE_ENGINE=1
 
 OPTIONS_GROUP+=		FEATURES
 OPTIONS_GROUP_FEATURES=	PERFSCHM
 FEATURES_DESC=		Default features knobs
 PERFSCHM_DESC=		Enable "Performance Schema" by default (High RAM usage)
 OPTIONS_DEFAULT+=	PERFSCHM
 
 PERFSCHM_SUB_LIST+=		PERFSCHEMRC=""
 PERFSCHM_SUB_LIST_OFF+=		PERFSCHEMRC="--skip-performance-schema"
 FEDERATED_SUB_LIST+=		FEDER="--federated"
 FEDERATED_SUB_LIST_OFF+=	FEDER=""
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
 SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
 .else
 SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${SSL_DEFAULT} == base
 CMAKE_ARGS+=		-DWITH_SSL=system
 .else
 CMAKE_ARGS+=		-DWITH_SSL=${OPENSSLBASE}
 .endif
 
 post-extract:
 	@${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
 
 post-patch:
 	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
 
 .if !defined(CLIENT_ONLY)
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
 	${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
 	${MKDIR} ${STAGEDIR}${MY_SECDIR}
 	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
 .endif
 
 .include <bsd.port.post.mk>
Index: head/databases/mysql80-server/distinfo
===================================================================
--- head/databases/mysql80-server/distinfo	(revision 501260)
+++ head/databases/mysql80-server/distinfo	(revision 501261)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551112616
-SHA256 (mysql-boost-8.0.15.tar.gz) = 95dbdb54c3967feefb255b96458b089a601e4de238bcc1f328b066018ee47db0
-SIZE (mysql-boost-8.0.15.tar.gz) = 117079697
+TIMESTAMP = 1556566256
+SHA256 (mysql-boost-8.0.16.tar.gz) = 7c936aa7bc9f4c462b24bade2e9abe1b3a6869ea19c46e78ec0a9b2a87a3d17f
+SIZE (mysql-boost-8.0.16.tar.gz) = 145939027
Index: head/databases/mysql80-server/files/patch-router_src_harness_CMakeLists.txt
===================================================================
--- head/databases/mysql80-server/files/patch-router_src_harness_CMakeLists.txt	(revision 501260)
+++ head/databases/mysql80-server/files/patch-router_src_harness_CMakeLists.txt	(nonexistent)
@@ -1,11 +0,0 @@
---- router/src/harness/CMakeLists.txt.orig	2018-11-04 22:41:07 UTC
-+++ router/src/harness/CMakeLists.txt
-@@ -128,7 +128,7 @@ IF(WIN32)
-     COMPILE_FLAGS -DHARNESS_STATIC_DEFINE)
- ENDIF()
- IF(THREADS_HAVE_PTHREAD_ARG)
--  target_compile_options(PUBLIC harness-archive "-pthread")
-+  target_compile_options(harness-archive PUBLIC "-pthread")
- ENDIF()
- 
- # create harness library - dynamic version

Property changes on: head/databases/mysql80-server/files/patch-router_src_harness_CMakeLists.txt
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/databases/mysql80-server/files/patch-client_CMakeLists.txt
===================================================================
--- head/databases/mysql80-server/files/patch-client_CMakeLists.txt	(revision 501260)
+++ head/databases/mysql80-server/files/patch-client_CMakeLists.txt	(revision 501261)
@@ -1,60 +1,53 @@
 --- client/CMakeLists.txt.orig	2018-12-20 20:14:03 UTC
 +++ client/CMakeLists.txt
-@@ -28,16 +28,16 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
+@@ -26,14 +26,14 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
  
  ## Subdirectory with common client code.
  ADD_SUBDIRECTORY(base)
 -## Subdirectory for mysqlpump code.
 -ADD_SUBDIRECTORY(dump)
  
- INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
- 
 +IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc pattern_matcher.cc)
+ MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc pattern_matcher.cc ${CMAKE_SOURCE_DIR}/sql/net_ns.cc)
  TARGET_LINK_LIBRARIES(mysql mysqlclient)
  IF(UNIX)
    TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
  ENDIF(UNIX)
 +ENDIF()
  
  IF(NOT WITHOUT_SERVER)
    MYSQL_ADD_EXECUTABLE(mysql_upgrade upgrade/program.cc)
 @@ -56,6 +56,7 @@ ADD_DEPENDENCIES(mysqltest GenError GenC
  ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
  TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
  
 +IF(FALSE)
  MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
  TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
  
 @@ -68,7 +69,9 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
  
  MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.cc)
  TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
 +ENDIF()
  
 +IF(FALSE)
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
  SET(MYSQLBINLOG_LIB_SOURCES
    ${CMAKE_SOURCE_DIR}/strings/decimal.cc
-@@ -110,16 +113,20 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
+@@ -107,12 +110,15 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
  
  MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
  TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
 +ENDIF()
  
  MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
  TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
  
 +IF(FALSE)
  MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc)
  TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl)
-+
- # Bug in /usr/lib/gcc-snapshot/lib/libstdc++.so ??
- IF(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL "9.0.0")
-   TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup -static-libstdc++)
- ENDIF()
 +ENDIF()
  
  # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
  IF(WIN32)
Index: head/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt
===================================================================
--- head/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt	(revision 501260)
+++ head/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt	(revision 501261)
@@ -1,18 +1,16 @@
 --- plugin/x/CMakeLists.txt.orig	2018-04-08 06:44:49 UTC
 +++ plugin/x/CMakeLists.txt
-@@ -89,12 +89,15 @@ INCLUDE_DIRECTORIES(
+@@ -80,11 +80,14 @@ INCLUDE_DIRECTORIES(
    ${MYSQLX_GENERATE_DIR}
    ${MYSQLX_PROTOCOL_INCLUDE_DIR}
    ${MYSQLX_CLIENT_INCLUDE_DIR}
 +  ${BOOST_INCLUDE_DIR}
  )
  
- INCLUDE_DIRECTORIES(SYSTEM
-   ${PROTOBUF_INCLUDE_DIRS}
-   ${LIBEVENT_INCLUDE_DIRS}
-   ${ICU_INCLUDE_DIRS}
-+  ${SSL_INCLUDE_DIRS}
-+  ${ZLIB_INCLUDE_DIR}
- )
+ MY_INCLUDE_SYSTEM_DIRECTORIES(PROTOBUF)
+ MY_INCLUDE_SYSTEM_DIRECTORIES(LIBEVENT)
+ MY_INCLUDE_SYSTEM_DIRECTORIES(ICU)
++MY_INCLUDE_SYSTEM_DIRECTORIES(SSL)
++MY_INCLUDE_SYSTEM_DIRECTORIES(ZLIB)
  
  SET(MYSQLX_PROTBUF_AND_PROTOCOL_LIB
Index: head/databases/mysql80-server/files/patch-sql_mysqld.cc
===================================================================
--- head/databases/mysql80-server/files/patch-sql_mysqld.cc	(revision 501260)
+++ head/databases/mysql80-server/files/patch-sql_mysqld.cc	(revision 501261)
@@ -1,29 +1,20 @@
 --- sql/mysqld.cc.orig	2018-10-07 08:44:22 UTC
 +++ sql/mysqld.cc
 @@ -4493,7 +4493,7 @@ static int warn_self_signed_ca() {
  
  static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED;
  
 -#if OPENSSL_VERSION_NUMBER < 0x10100000L
 +#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
  #define FILE_LINE_ARGS
  #else
  #define FILE_LINE_ARGS , const char *, int
 @@ -4530,7 +4530,7 @@ static void init_ssl() {
  
- static int init_ssl_communication() {
+ static void init_ssl() {
  #ifdef HAVE_OPENSSL
--#ifndef HAVE_WOLFSSL
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-   char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-   int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string);
-   if (ret_fips_mode != 1) {
-@@ -8919,7 +8919,7 @@ bool mysqld_get_one_option(int optid,
-         One can disable SSL later by using --skip-ssl or --ssl=0.
-       */
-       opt_use_ssl = true;
--#ifdef HAVE_WOLFSSL
-+#if defined(HAVE_WOLFSSL) || defined(LIBRESSL_VERSION_NUMBER)
-       /* crl has no effect in wolfSSL. */
-       opt_ssl_crl = NULL;
-       opt_ssl_crlpath = NULL;
+-#if !defined(HAVE_WOLFSSL) && !defined(__sun)
++#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) && !defined(__sun)
+ #if defined(HAVE_PSI_MEMORY_INTERFACE)
+   static PSI_memory_info all_openssl_memory[] = {
+       {&key_memory_openssl, "openssl_malloc", 0, 0,
Index: head/databases/mysql80-server/pkg-plist
===================================================================
--- head/databases/mysql80-server/pkg-plist	(revision 501260)
+++ head/databases/mysql80-server/pkg-plist	(revision 501261)
@@ -1,205 +1,212 @@
 LICENSE.router
 README.router
 bin/ibd2sdi
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
 bin/myisamchk
 bin/myisamlog
 bin/myisampack
 bin/mysql_secure_installation
 bin/mysql_tzinfo_to_sql
 bin/mysql_upgrade
 bin/mysqld_multi
 bin/mysqld_safe
 bin/mysqldumpslow
 bin/mysqlrouter
+bin/mysqlrouter_passwd
 bin/mysqlrouter_plugin_info
 bin/mysqltest
 bin/mysqlxtest
 bin/perror
 bin/zlib_decompress
 lib/mysql/libmysqlharness.a
 lib/mysql/libmysqlharness.so
 lib/mysql/libmysqlharness.so.1
 lib/mysql/libmysqlrouter.so
 lib/mysql/libmysqlrouter.so.1
+lib/mysql/libmysqlrouter_http.so
+lib/mysql/libmysqlrouter_http.so.1
+lib/mysql/mysqlrouter/http_auth_backend.so
+lib/mysql/mysqlrouter/http_auth_realm.so
+lib/mysql/mysqlrouter/http_server.so
 lib/mysql/mysqlrouter/keepalive.so
 lib/mysql/mysqlrouter/metadata_cache.so
 lib/mysql/mysqlrouter/mysql_protocol.so
 lib/mysql/mysqlrouter/routing.so
-lib/mysql/mysqlrouter/syslog.so
 lib/mysql/plugin/adt_null.so
 lib/mysql/plugin/auth.so
 lib/mysql/plugin/auth_test_plugin.so
 lib/mysql/plugin/component_audit_api_message_emit.so
 lib/mysql/plugin/component_example_component1.so
 lib/mysql/plugin/component_example_component2.so
 lib/mysql/plugin/component_example_component3.so
 lib/mysql/plugin/component_log_filter_dragnet.so
 lib/mysql/plugin/component_log_sink_json.so
 lib/mysql/plugin/component_log_sink_syseventlog.so
 lib/mysql/plugin/component_log_sink_test.so
 lib/mysql/plugin/component_mysqlx_global_reset.so
 lib/mysql/plugin/component_pfs_example.so
 lib/mysql/plugin/component_pfs_example_component_population.so
 lib/mysql/plugin/component_test_audit_api_message.so
 lib/mysql/plugin/component_test_backup_lock_service.so
 lib/mysql/plugin/component_test_host_application_signal.so
+lib/mysql/plugin/component_test_mysql_runtime_error.so
 lib/mysql/plugin/component_test_pfs_notification.so
 lib/mysql/plugin/component_test_pfs_resource_group.so
 lib/mysql/plugin/component_test_status_var_service.so
 lib/mysql/plugin/component_test_status_var_service_int.so
 lib/mysql/plugin/component_test_status_var_service_reg_only.so
 lib/mysql/plugin/component_test_status_var_service_str.so
 lib/mysql/plugin/component_test_status_var_service_unreg_only.so
 lib/mysql/plugin/component_test_string_service.so
 lib/mysql/plugin/component_test_string_service_charset.so
 lib/mysql/plugin/component_test_string_service_long.so
 lib/mysql/plugin/component_test_sys_var_service.so
 lib/mysql/plugin/component_test_sys_var_service_int.so
 lib/mysql/plugin/component_test_sys_var_service_same.so
 lib/mysql/plugin/component_test_sys_var_service_str.so
 lib/mysql/plugin/component_test_system_variable_source.so
 lib/mysql/plugin/component_test_udf_registration.so
 lib/mysql/plugin/component_udf_reg_3_func.so
 lib/mysql/plugin/component_udf_reg_avg_func.so
 lib/mysql/plugin/component_udf_reg_int_func.so
 lib/mysql/plugin/component_udf_reg_int_same_func.so
 lib/mysql/plugin/component_udf_reg_only_3_func.so
 lib/mysql/plugin/component_udf_reg_real_func.so
 lib/mysql/plugin/component_udf_unreg_3_func.so
 lib/mysql/plugin/component_udf_unreg_int_func.so
 lib/mysql/plugin/component_udf_unreg_real_func.so
 lib/mysql/plugin/component_validate_password.so
 lib/mysql/plugin/connection_control.so
 lib/mysql/plugin/daemon_example.ini
+lib/mysql/plugin/ddl_rewriter.so
 lib/mysql/plugin/group_replication.so
 %%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so
 lib/mysql/plugin/ha_mock.so
 lib/mysql/plugin/keyring_file.so
 lib/mysql/plugin/libdaemon_example.so
 lib/mysql/plugin/libtest_framework.so
 lib/mysql/plugin/libtest_services.so
 lib/mysql/plugin/libtest_services_threaded.so
 lib/mysql/plugin/libtest_session_attach.so
 lib/mysql/plugin/libtest_session_detach.so
 lib/mysql/plugin/libtest_session_in_thd.so
 lib/mysql/plugin/libtest_session_info.so
 lib/mysql/plugin/libtest_sql_2_sessions.so
 lib/mysql/plugin/libtest_sql_all_col_types.so
 lib/mysql/plugin/libtest_sql_cmds_1.so
 lib/mysql/plugin/libtest_sql_commit.so
 lib/mysql/plugin/libtest_sql_complex.so
 lib/mysql/plugin/libtest_sql_errors.so
 lib/mysql/plugin/libtest_sql_lock.so
 lib/mysql/plugin/libtest_sql_processlist.so
 lib/mysql/plugin/libtest_sql_replication.so
+lib/mysql/plugin/libtest_sql_reset_connection.so
 lib/mysql/plugin/libtest_sql_shutdown.so
 lib/mysql/plugin/libtest_sql_sqlmode.so
 lib/mysql/plugin/libtest_sql_stmt.so
 lib/mysql/plugin/libtest_sql_stored_procedures_functions.so
 lib/mysql/plugin/libtest_sql_views_triggers.so
 lib/mysql/plugin/libtest_x_sessions_deinit.so
 lib/mysql/plugin/libtest_x_sessions_init.so
 lib/mysql/plugin/locking_service.so
 lib/mysql/plugin/mypluglib.so
 lib/mysql/plugin/mysql_no_login.so
 lib/mysql/plugin/pfs_example_plugin_employee.so
 lib/mysql/plugin/qa_auth_client.so
 lib/mysql/plugin/qa_auth_interface.so
 lib/mysql/plugin/qa_auth_server.so
 lib/mysql/plugin/replication_observers_example_plugin.so
 lib/mysql/plugin/rewrite_example.so
 lib/mysql/plugin/rewriter.so
 lib/mysql/plugin/semisync_master.so
 lib/mysql/plugin/semisync_slave.so
 lib/mysql/plugin/test_security_context.so
 lib/mysql/plugin/test_services_host_application_signal.so
 lib/mysql/plugin/test_services_plugin_registry.so
 lib/mysql/plugin/udf_example.so
 lib/mysql/plugin/keyring_udf.so
 lib/mysql/plugin/test_udf_services.so
 lib/mysql/plugin/validate_password.so
 lib/mysql/plugin/version_token.so
 libdata/pkgconfig/LIBMYSQL_OS_OUTPUT_NAME-NOTFOUND.pc
 libexec/mysqld
 man/man1/my_print_defaults.1.gz
 man/man1/myisam_ftdump.1.gz
 man/man1/myisamchk.1.gz
 man/man1/myisamlog.1.gz
 man/man1/myisampack.1.gz
 man/man1/mysql.server.1.gz
 man/man1/mysql_secure_installation.1.gz
 man/man1/mysql_tzinfo_to_sql.1.gz
 man/man1/mysql_upgrade.1.gz
 man/man1/mysqld_multi.1.gz
 man/man1/mysqld_safe.1.gz
 man/man1/mysqldumpslow.1.gz
 man/man1/mysqlman.1.gz
 man/man1/perror.1.gz
 man/man8/mysqld.8.gz
 %%DATADIR%%/bulgarian/errmsg.sys
 %%DATADIR%%/charsets/Index.xml
 %%DATADIR%%/charsets/README
 %%DATADIR%%/charsets/armscii8.xml
 %%DATADIR%%/charsets/ascii.xml
 %%DATADIR%%/charsets/cp1250.xml
 %%DATADIR%%/charsets/cp1251.xml
 %%DATADIR%%/charsets/cp1256.xml
 %%DATADIR%%/charsets/cp1257.xml
 %%DATADIR%%/charsets/cp850.xml
 %%DATADIR%%/charsets/cp852.xml
 %%DATADIR%%/charsets/cp866.xml
 %%DATADIR%%/charsets/dec8.xml
 %%DATADIR%%/charsets/geostd8.xml
 %%DATADIR%%/charsets/greek.xml
 %%DATADIR%%/charsets/hebrew.xml
 %%DATADIR%%/charsets/hp8.xml
 %%DATADIR%%/charsets/keybcs2.xml
 %%DATADIR%%/charsets/koi8r.xml
 %%DATADIR%%/charsets/koi8u.xml
 %%DATADIR%%/charsets/latin1.xml
 %%DATADIR%%/charsets/latin2.xml
 %%DATADIR%%/charsets/latin5.xml
 %%DATADIR%%/charsets/latin7.xml
 %%DATADIR%%/charsets/macce.xml
 %%DATADIR%%/charsets/macroman.xml
 %%DATADIR%%/charsets/swe7.xml
 %%DATADIR%%/czech/errmsg.sys
 %%DATADIR%%/danish/errmsg.sys
 %%DATADIR%%/dictionary.txt
 %%DATADIR%%/dutch/errmsg.sys
 %%DATADIR%%/english/errmsg.sys
 %%DATADIR%%/errmsg-utf8.txt
 %%DATADIR%%/estonian/errmsg.sys
 %%DATADIR%%/french/errmsg.sys
 %%DATADIR%%/german/errmsg.sys
 %%DATADIR%%/greek/errmsg.sys
 %%DATADIR%%/hungarian/errmsg.sys
 %%DATADIR%%/innodb_memcached_config.sql
 %%DATADIR%%/install_rewriter.sql
 %%DATADIR%%/italian/errmsg.sys
 %%DATADIR%%/japanese/errmsg.sys
 %%DATADIR%%/korean/errmsg.sys
-%%DATADIR%%/magic
 %%DATADIR%%/mysql-log-rotate
 %%DATADIR%%/mysql.server
 %%DATADIR%%/mysqld_multi.server
 %%DATADIR%%/norwegian-ny/errmsg.sys
 %%DATADIR%%/norwegian/errmsg.sys
 %%DATADIR%%/polish/errmsg.sys
 %%DATADIR%%/portuguese/errmsg.sys
 %%DATADIR%%/romanian/errmsg.sys
 %%DATADIR%%/russian/errmsg.sys
 %%DATADIR%%/serbian/errmsg.sys
 %%DATADIR%%/slovak/errmsg.sys
 %%DATADIR%%/spanish/errmsg.sys
 %%DATADIR%%/swedish/errmsg.sys
 %%DATADIR%%/ukrainian/errmsg.sys
 %%DATADIR%%/uninstall_rewriter.sql
 @dir lib/mysql/plugin/debug
 @sample(root,wheel,0644) %%ETCDIR%%/my.cnf.sample
 @dir(mysql,mysql,0750) %%ETCDIR%%/keyring
 @dir(mysql,mysql,0750) %%MY_SECDIR%%
 @dir(mysql,mysql,0750) %%MY_TMPDIR%%