10 files changed, 207 insertions, 132 deletions

diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile
index f137fb34026a..b2152675a803 100644
--- a/databases/mysql80-client/Makefile
+++ b/databases/mysql80-client/Makefile
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PORTNAME=	mysql
-PORTREVISION?=	3
 PKGNAMESUFFIX=	80-client
 
 COMMENT=	Multithreaded SQL database (client)
@@ -23,7 +22,7 @@ CONFLICTS_INSTALL=	mysql8[1-9]-client-* \
 			mariadb[0-9][0-9]-client-* \
 			percona[0-9][0-9]-client-*
 
-CMAKE_ARGS+=	-DWITHOUT_SERVER=1
+CMAKE_ARGS+=	-DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0
 
 USE_LDCONFIG+=	${PREFIX}/lib/mysql
 
diff --git a/databases/mysql80-client/files/patch-CMakeLists.txt b/databases/mysql80-client/files/patch-CMakeLists.txt
index 4d202eb72f10..8899cffb27ea 100644
--- a/databases/mysql80-client/files/patch-CMakeLists.txt
+++ b/databases/mysql80-client/files/patch-CMakeLists.txt
@@ -1,16 +1,24 @@
---- CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+--- CMakeLists.txt.orig	2017-06-27 11:44:29 UTC
 +++ CMakeLists.txt
-@@ -606,8 +606,8 @@ ENDIF()
+@@ -700,9 +700,6 @@ IF(NOT WITHOUT_SERVER)
+   SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "")
+   # Add storage engines and plugins.
+   CONFIGURE_PLUGINS()
+-ELSE()
+-  # We may still want Cluster client libraries, use -DWITH_NDBCLUSTER=1
+-  ADD_SUBDIRECTORY(storage/ndb)
+ ENDIF()
  
- ADD_SUBDIRECTORY(extra)
- ADD_SUBDIRECTORY(client)
--ADD_SUBDIRECTORY(sql/share)
- ADD_SUBDIRECTORY(libservices)
+ ADD_SUBDIRECTORY(include)
+@@ -715,6 +712,7 @@ ADD_SUBDIRECTORY(extra/regex)
+ ADD_SUBDIRECTORY(libmysql)
+ ADD_SUBDIRECTORY(libbinlogevents)
+ ADD_SUBDIRECTORY(libbinlogstandalone)
 +ADD_SUBDIRECTORY(support-files)
  
- IF(UNIX)
-   ADD_SUBDIRECTORY(man)
-@@ -676,14 +676,13 @@ ELSE()
+ IF(NOT WITHOUT_SERVER)
+   SET (MYSQLD_STATIC_COMPONENT_LIBS "" CACHE INTERNAL "")
+@@ -811,14 +809,13 @@ ELSE()
    SET(CPACK_GENERATOR "TGZ")
  ENDIF() 
  ADD_SUBDIRECTORY(packaging/WiX)
@@ -26,7 +34,7 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -706,6 +705,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+@@ -841,6 +838,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
  ENDIF()
diff --git a/databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h b/databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h
index 34fbf5a45509..47a9c7ca00ac 100644
--- a/databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h
+++ b/databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h
@@ -1,5 +1,5 @@
---- cmd-line-utils/libedit/chartype.h.orig	2016-03-28 18:06:12 UTC
-+++ cmd-line-utils/libedit/chartype.h
+--- extra/libedit/chartype.h.orig	2016-03-28 18:06:12 UTC
++++ extra/libedit/chartype.h
 @@ -49,7 +49,7 @@
    TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
  #if !defined(__NetBSD__) && !defined(__sun) \
diff --git a/databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c b/databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c
index cb3e255991ab..1ee69856abf0 100644
--- a/databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c
+++ b/databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c
@@ -1,5 +1,5 @@
---- cmd-line-utils/libedit/vi.c.orig	2016-03-28 18:06:12 UTC
-+++ cmd-line-utils/libedit/vi.c
+--- extra/libedit/vi.c.orig	2016-03-28 18:06:12 UTC
++++ extra/libedit/vi.c
 @@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att
   * NB: posix implies that we should enter insert mode, however
   * this is against historical precedent...
diff --git a/databases/mysql80-client/files/patch-include_CMakeLists.txt b/databases/mysql80-client/files/patch-include_CMakeLists.txt
index 39d82affe23d..479a659b6457 100644
--- a/databases/mysql80-client/files/patch-include_CMakeLists.txt
+++ b/databases/mysql80-client/files/patch-include_CMakeLists.txt
@@ -1,56 +1,88 @@
---- include/CMakeLists.txt.orig	2016-08-25 12:32:09 UTC
+--- include/CMakeLists.txt.orig	2017-09-21 15:51:58 UTC
 +++ include/CMakeLists.txt
-@@ -37,6 +37,7 @@ SET(HEADERS_ABI 
- 
- SET(HEADERS 
-   ${HEADERS_ABI} 
-+  hash.h
-   my_dbug.h 
-   m_string.h
-   my_sys.h 
-@@ -64,6 +65,81 @@ SET(HEADERS 
-   thr_cond.h
-   thr_mutex.h
-   thr_rwlock.h
+@@ -30,11 +30,179 @@ SET(HEADERS
+   ${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h
+   ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h
+   ../libbinlogevents/export/binary_log_types.h
 +  base64.h
++  big_endian.h
++  byte_order_generic.h
++  byte_order_generic_x86.h
 +  c_string_less.h
 +  crypt_genhash_impl.h
++  decimal.h
 +  depth_first_search.h
 +  dur_prop.h
++  errmsg.h
 +  ft_global.h
++  hash.h
 +  heap.h
-+  i_callable.h
-+  instance_callback.h
++  keycache.h
++  lex_string.h
 +  lf.h
++  little_endian.h
++  m_ctype.h
++  m_string.h
++  map_helpers.h
++  mem_root_fwd.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
-+  myisam.h.orig
 +  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
@@ -70,33 +102,81 @@
 +  pfs_thread_provider.h
 +  pfs_transaction_provider.h
 +  prealloced_array.h
++  print_version.h
 +  priority_queue.h
-+  probes_mysql.d.base
-+  probes_mysql.h
-+  probes_mysql_nodtrace.h
-+  queues.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
 +  str_uca_type.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
-   ${HEADERS_GEN_CONFIGURE}
  )
- 
-@@ -76,5 +152,9 @@ INSTALL(DIRECTORY mysql/ DESTINATION ${I
-  PATTERN "*.h"
-  PATTERN "psi_abi*" EXCLUDE
+ 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_my_snprintf.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(DIRECTORY atomic/ DESTINATION ${INSTALL_INCLUDEDIR}/atomic COMPONENT Development 
-+ PATTERN "*.h"
-+ PATTERN "psi_abi*" EXCLUDE
-+)
- 
  
+ INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
diff --git a/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt b/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt
index b90821a7f767..9c6fb0acb77d 100644
--- a/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt
+++ b/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt
@@ -1,6 +1,18 @@
---- libmysql/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+--- libmysql/CMakeLists.txt.orig	2017-06-27 11:44:29 UTC
 +++ libmysql/CMakeLists.txt
-@@ -260,7 +260,7 @@ IF(NOT DISABLE_SHARED)
+@@ -181,6 +181,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C)
+   )
+ ENDIF()
+ 
++INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
++IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++  ADD_COMPILE_FLAGS(${CLIENT_SOURCES} COMPILE_FLAGS "-fPIC")
++ENDIF()
++
+ #
+ # Include protocol tracing infrastructure and the test
+ # trace plugin if enabled by build options.
+@@ -254,7 +258,7 @@ IF(NOT DISABLE_SHARED)
      COMPONENT SharedLibraries)
    IF(UNIX)
      # libtool compatability
diff --git a/databases/mysql80-client/files/patch-sql_share_CMakeLists.txt b/databases/mysql80-client/files/patch-sql_share_CMakeLists.txt
new file mode 100644
index 000000000000..c3850eb0a2c0
--- /dev/null
+++ b/databases/mysql80-client/files/patch-sql_share_CMakeLists.txt
@@ -0,0 +1,27 @@
+--- sql/share/CMakeLists.txt.orig	2017-10-03 10:54:31 UTC
++++ sql/share/CMakeLists.txt
+@@ -45,6 +45,7 @@ SET(files 
+  dictionary.txt
+ )
+ 
++IF (FALSE)
+ FOREACH (dir ${dirs})
+   INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${dir} 
+           DESTINATION ${INSTALL_MYSQLSHAREDIR}
+@@ -57,13 +58,16 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE
+         COMPONENT Server
+         PATTERN "languages.html" EXCLUDE
+ )
++ENDIF()
+ 
+ # Don't copy if we're building in-source.
+ IF (NOT ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+   CONFIGURE_FILE(dictionary.txt ${CMAKE_BINARY_DIR}/sql/share/dictionary.txt)
+ ENDIF()
+ 
++IF (FALSE)
+ INSTALL(FILES ${files}
+         DESTINATION ${INSTALL_MYSQLSHAREDIR}
+         COMPONENT Server
+ )
++ENDIF()
diff --git a/databases/mysql80-client/files/patch-support-files_CMakeLists.txt b/databases/mysql80-client/files/patch-support-files_CMakeLists.txt
index 218a1e701b67..198e56776eb8 100644
--- a/databases/mysql80-client/files/patch-support-files_CMakeLists.txt
+++ b/databases/mysql80-client/files/patch-support-files_CMakeLists.txt
@@ -1,37 +1,23 @@
---- support-files/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+--- support-files/CMakeLists.txt.orig	2017-06-27 11:44:29 UTC
 +++ support-files/CMakeLists.txt
-@@ -44,14 +44,17 @@ ELSE()
-   SET(inst_location ${INSTALL_SUPPORTFILESDIR})
- ENDIF()
- 
-+IF(FALSE)
- SET(inifile my-default)
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh 
-                ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension}
-         DESTINATION ${inst_location} COMPONENT IniFiles)
-+ENDIF()
- 
- IF(UNIX)
+@@ -46,6 +46,7 @@ IF(UNIX)
+   ELSE()
+     SET (PIDOF "pgrep -d' ' -f")
+   ENDIF()
++IF (FALSE)
    SET(prefix ${CMAKE_INSTALL_PREFIX})
-+IF(FALSE)
    FOREACH(script  mysqld_multi.server mysql-log-rotate)
      CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
-                    ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
-@@ -68,9 +71,11 @@ IF(UNIX)
+@@ -59,9 +60,12 @@ IF(UNIX)
    IF(INSTALL_SUPPORTFILESDIR)
      INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
    ENDIF()
 +ENDIF()
++ENDIF()
  
    INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
    
-+IF(FALSE)
++IF (FALSE)
    SET(bindir ${prefix}/${INSTALL_BINDIR})
    SET(sbindir ${prefix}/${INSTALL_SBINDIR})
-   SET(scriptdir ${prefix}/${INSTALL_SCRIPTDIR})
-@@ -83,3 +88,4 @@ IF(UNIX)
-     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
-     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- ENDIF()
-+ENDIF()
+   SET(libexecdir ${prefix}/${INSTALL_SBINDIR})
diff --git a/databases/mysql80-client/files/patch-extra_CMakeLists.txt b/databases/mysql80-client/files/patch-utilities_CMakeLists.txt
index 045b98549e41..d2a2e341e416 100644
--- a/databases/mysql80-client/files/patch-extra_CMakeLists.txt
+++ b/databases/mysql80-client/files/patch-utilities_CMakeLists.txt
@@ -1,5 +1,5 @@
---- extra/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
-+++ extra/CMakeLists.txt
+--- utilities/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
++++ utilities/CMakeLists.txt
 @@ -45,6 +45,7 @@ ENDIF()
  
  ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h 
diff --git a/databases/mysql80-client/pkg-plist b/databases/mysql80-client/pkg-plist
index f7a498e493bc..f917a837029e 100644
--- a/databases/mysql80-client/pkg-plist
+++ b/databases/mysql80-client/pkg-plist
@@ -10,10 +10,6 @@ bin/mysqlimport
 bin/mysqlpump
 bin/mysqlshow
 bin/mysqlslap
-include/mysql/atomic/gcc_atomic.h
-include/mysql/atomic/gcc_sync.h
-include/mysql/atomic/generic-msvc.h
-include/mysql/atomic/solaris.h
 include/mysql/base64.h
 include/mysql/big_endian.h
 include/mysql/binary_log_types.h
@@ -28,13 +24,15 @@ include/mysql/errmsg.h
 include/mysql/ft_global.h
 include/mysql/hash.h
 include/mysql/heap.h
-include/mysql/i_callable.h
-include/mysql/instance_callback.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/mem_root_fwd.h
+include/mysql/mf_wcomp.h
 include/mysql/mutex_lock.h
 include/mysql/my_aes.h
 include/mysql/my_alloc.h
@@ -47,22 +45,33 @@ include/mysql/my_check_opt.h
 include/mysql/my_command.h
 include/mysql/my_compare.h
 include/mysql/my_compiler.h
-include/mysql/my_config.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_global.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
@@ -81,14 +90,6 @@ 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/components/component_implementation.h
-include/mysql/mysql/components/my_service.h
-include/mysql/mysql/components/service.h
-include/mysql/mysql/components/service_implementation.h
-include/mysql/mysql/components/services/dynamic_loader.h
-include/mysql/mysql/components/services/dynamic_loader_scheme_file.h
-include/mysql/mysql/components/services/persistent_dynamic_loader.h
-include/mysql/mysql/components/services/registry.h
 include/mysql/mysql/get_password.h
 include/mysql/mysql/group_replication_priv.h
 include/mysql/mysql/innodb_priv.h
@@ -107,37 +108,6 @@ 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/psi/mysql_cond.h
-include/mysql/mysql/psi/mysql_error.h
-include/mysql/mysql/psi/mysql_file.h
-include/mysql/mysql/psi/mysql_idle.h
-include/mysql/mysql/psi/mysql_mdl.h
-include/mysql/mysql/psi/mysql_memory.h
-include/mysql/mysql/psi/mysql_mutex.h
-include/mysql/mysql/psi/mysql_ps.h
-include/mysql/mysql/psi/mysql_rwlock.h
-include/mysql/mysql/psi/mysql_socket.h
-include/mysql/mysql/psi/mysql_sp.h
-include/mysql/mysql/psi/mysql_stage.h
-include/mysql/mysql/psi/mysql_statement.h
-include/mysql/mysql/psi/mysql_table.h
-include/mysql/mysql/psi/mysql_thread.h
-include/mysql/mysql/psi/mysql_transaction.h
-include/mysql/mysql/psi/psi_base.h
-include/mysql/mysql/psi/psi_cond.h
-include/mysql/mysql/psi/psi_error.h
-include/mysql/mysql/psi/psi_file.h
-include/mysql/mysql/psi/psi_idle.h
-include/mysql/mysql/psi/psi_mdl.h
-include/mysql/mysql/psi/psi_memory.h
-include/mysql/mysql/psi/psi_mutex.h
-include/mysql/mysql/psi/psi_rwlock.h
-include/mysql/mysql/psi/psi_socket.h
-include/mysql/mysql/psi/psi_stage.h
-include/mysql/mysql/psi/psi_statement.h
-include/mysql/mysql/psi/psi_table.h
-include/mysql/mysql/psi/psi_thread.h
-include/mysql/mysql/psi/psi_transaction.h
 include/mysql/mysql/service_command.h
 include/mysql/mysql/service_locking.h
 include/mysql/mysql/service_my_plugin_log.h
@@ -147,6 +117,7 @@ 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
@@ -162,12 +133,12 @@ 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_ername.h
 include/mysql/mysqld_error.h
 include/mysql/mysys_err.h
 include/mysql/nullable.h
@@ -186,18 +157,9 @@ 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/plugin.h
-include/mysql/plugin_audit.h
-include/mysql/plugin_ftparser.h
-include/mysql/plugin_group_replication.h
-include/mysql/plugin_keyring.h
-include/mysql/plugin_validate_password.h
 include/mysql/prealloced_array.h
+include/mysql/print_version.h
 include/mysql/priority_queue.h
-include/mysql/probes_mysql.d.base
-include/mysql/probes_mysql.h
-include/mysql/probes_mysql_nodtrace.h
-include/mysql/queues.h
 include/mysql/rwlock_scoped_lock.h
 include/mysql/scope_guard.h
 include/mysql/service_versions.h
@@ -216,6 +178,7 @@ 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