databases/mysql80-{server, client}: Update port to the latest release 8.0.2

Changes happened into format of --version which caused r450384

Reviewed by:	mat (mentor)
Approved by:	mat (mentor)
Sponsored by:	Netzkommune GmbH
Differential Revision:	https://reviews.freebsd.org/D12579

21 files changed, 78 insertions, 186 deletions

diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile
index a65c6ec1ef50..980830c48e6a 100644
--- a/databases/mysql80-server/Makefile
+++ b/databases/mysql80-server/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=		mysql
-PORTVERSION=		8.0.0
+PORTVERSION=		8.0.2
 DISTVERSIONSUFFIX?=	-dmr
-PORTREVISION?=		5
 CATEGORIES=		databases ipv6
 MASTER_SITES=		MYSQL/MySQL-8.0
 PKGNAMESUFFIX?=		80-server
@@ -31,6 +30,7 @@ LIB_DEPENDS+=	libevent.so:devel/libevent \
 		liblz4.so:archivers/liblz4
 
 CMAKE_BUILD_TYPE=	Release
+CFLAGS+=		-fPIC
 
 CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
 		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
@@ -77,6 +77,7 @@ PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
 USES+=		mysql:80
+IGNORE_FreeBSD_10=	"FreeBSD 10.0 doesn't have _cxa_thread_atexit() implemeneted in libc, it has been implemented since 11
 
 CONFLICTS_INSTALL=	mysql8[1-9]-server-* \
 			mysql[0-79][0-9]-server-* \
diff --git a/databases/mysql80-server/distinfo b/databases/mysql80-server/distinfo
index cd9b2dd6ff9f..6c5118529bc6 100644
--- a/databases/mysql80-server/distinfo
+++ b/databases/mysql80-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483372244
-SHA256 (mysql-boost-8.0.0-dmr.tar.gz) = e5b7b77e532c906dc30f12b821950426b8205a64b5a77c26681e2109a3b6a5fc
-SIZE (mysql-boost-8.0.0-dmr.tar.gz) = 65567795
+TIMESTAMP = 1505989679
+SHA256 (mysql-boost-8.0.2-dmr.tar.gz) = a93f63e8ac72046bc5b0dc8515c60dd72faaaff352652aa46375f3a484ac3872
+SIZE (mysql-boost-8.0.2-dmr.tar.gz) = 60697707
diff --git a/databases/mysql80-server/files/patch-CMakeLists.txt b/databases/mysql80-server/files/patch-CMakeLists.txt
index fe05a9c83935..f5aa2259a24a 100644
--- a/databases/mysql80-server/files/patch-CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-CMakeLists.txt
@@ -1,19 +1,14 @@
---- CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+--- CMakeLists.txt.orig	2017-06-27 11:44:29 UTC
 +++ CMakeLists.txt
-@@ -614,12 +614,10 @@ IF(UNIX)
+@@ -750,7 +750,6 @@ IF(UNIX)
  ENDIF()
  
  IF(NOT WITHOUT_SERVER)
 -  ADD_SUBDIRECTORY(testclients)
    ADD_SUBDIRECTORY(sql)
-   OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
-   IF(WITH_EMBEDDED_SERVER) 
-    ADD_SUBDIRECTORY(libmysqld)
--   ADD_SUBDIRECTORY(libmysqld/examples)
-   ENDIF(WITH_EMBEDDED_SERVER)
  ENDIF()
  
-@@ -628,8 +626,6 @@ ENDIF()
+@@ -759,8 +758,6 @@ ENDIF()
  ADD_SUBDIRECTORY(scripts)
  
  IF(NOT WITHOUT_SERVER)
@@ -22,7 +17,7 @@
    ADD_SUBDIRECTORY(support-files)
    IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
      ADD_SUBDIRECTORY(internal)
-@@ -684,6 +680,7 @@ ENDIF()
+@@ -819,6 +816,7 @@ ENDIF()
  #
  # RPM installs documentation directly from the source tree
  #
@@ -30,7 +25,7 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -706,6 +703,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+@@ -841,6 +839,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
  ENDIF()
diff --git a/databases/mysql80-server/files/patch-cmake_plugin.cmake b/databases/mysql80-server/files/patch-cmake_plugin.cmake
index 65d4bc2b4d31..7feda81543ba 100644
--- a/databases/mysql80-server/files/patch-cmake_plugin.cmake
+++ b/databases/mysql80-server/files/patch-cmake_plugin.cmake
@@ -1,12 +1,12 @@
---- cmake/plugin.cmake.orig	2016-03-28 18:06:12 UTC
+--- cmake/plugin.cmake.orig	2017-06-27 11:44:29 UTC
 +++ cmake/plugin.cmake
-@@ -237,9 +237,6 @@ MACRO(MYSQL_ADD_PLUGIN)
-     MYSQL_INSTALL_TARGETS(${target}
-       DESTINATION ${INSTALL_PLUGINDIR}
-       COMPONENT ${INSTALL_COMPONENT})
--    INSTALL_DEBUG_TARGET(${target}
--      DESTINATION ${INSTALL_PLUGINDIR}/debug
--      COMPONENT ${INSTALL_COMPONENT})
-     # Add installed files to list for RPMs
-     FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
-             "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
+@@ -207,9 +207,6 @@ MACRO(MYSQL_ADD_PLUGIN)
+       MYSQL_INSTALL_TARGETS(${target}
+         DESTINATION ${INSTALL_PLUGINDIR}
+         COMPONENT ${INSTALL_COMPONENT})
+-      INSTALL_DEBUG_TARGET(${target}
+-        DESTINATION ${INSTALL_PLUGINDIR}/debug
+-        COMPONENT ${INSTALL_COMPONENT})
+       # For internal testing in PB2, append collections files
+       IF(DEFINED ENV{PB2WORKDIR})
+         PLUGIN_APPEND_COLLECTIONS(${plugin})
diff --git a/databases/mysql80-server/files/patch-cmd-line-utils_libedit_chartype.h b/databases/mysql80-server/files/patch-cmd-line-utils_libedit_chartype.h
index 34fbf5a45509..47a9c7ca00ac 100644
--- a/databases/mysql80-server/files/patch-cmd-line-utils_libedit_chartype.h
+++ b/databases/mysql80-server/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-server/files/patch-cmd-line-utils_libedit_vi.c b/databases/mysql80-server/files/patch-cmd-line-utils_libedit_vi.c
index cb3e255991ab..1ee69856abf0 100644
--- a/databases/mysql80-server/files/patch-cmd-line-utils_libedit_vi.c
+++ b/databases/mysql80-server/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-server/files/patch-include_CMakeLists.txt b/databases/mysql80-server/files/patch-include_CMakeLists.txt
index cb451ddc6ac4..6b61c38da4b8 100644
--- a/databases/mysql80-server/files/patch-include_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-include_CMakeLists.txt
@@ -1,19 +1,10 @@
---- include/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+--- include/CMakeLists.txt.orig	2017-06-27 11:44:29 UTC
 +++ include/CMakeLists.txt
-@@ -69,14 +69,13 @@ SET(HEADERS 
-   ${HEADERS_GEN_CONFIGURE}
+@@ -37,5 +37,7 @@ SET(HEADERS_MYSQL_DIR
+   mysql/udf_registration_types.h
  )
  
 +IF(FALSE)
- INSTALL(FILES
-   ../libbinlogevents/export/binary_log_types.h
-   DESTINATION ${INSTALL_INCLUDEDIR}
--  COMPONENT Development)
--INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
--INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development 
-  PATTERN "*.h"
-  PATTERN "psi_abi*" EXCLUDE
- )
+ INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
+ INSTALL(FILES ${HEADERS_MYSQL_DIR} DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development)
 +ENDIF()
- 
- 
diff --git a/databases/mysql80-server/files/patch-plugin_password__validation_validate__password.cc b/databases/mysql80-server/files/patch-plugin_password__validation_validate__password.cc
index 47fc0dc6b7e5..e9ec35e342b8 100644
--- a/databases/mysql80-server/files/patch-plugin_password__validation_validate__password.cc
+++ b/databases/mysql80-server/files/patch-plugin_password__validation_validate__password.cc
@@ -1,11 +1,11 @@
---- plugin/password_validation/validate_password.cc.orig	2016-03-28 18:06:12 UTC
+--- plugin/password_validation/validate_password.cc.orig	2017-06-27 11:44:29 UTC
 +++ plugin/password_validation/validate_password.cc
-@@ -18,6 +18,8 @@
+@@ -17,6 +17,8 @@
  #include <mysql/plugin_validate_password.h>
  #include <mysql/service_my_plugin_log.h>
  #include <mysql/service_mysql_string.h>
 +/* solve clash between libc++ bitset::test() and test macro from my_global.h */
 +#undef test
- #include <set>
- #include <iostream>
- #include <fstream>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/types.h>
diff --git a/databases/mysql80-server/files/patch-rapid_plugin_x_CMakeLists.txt b/databases/mysql80-server/files/patch-rapid_plugin_x_CMakeLists.txt
index 7dddb54da652..08796b2f1642 100644
--- a/databases/mysql80-server/files/patch-rapid_plugin_x_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-rapid_plugin_x_CMakeLists.txt
@@ -1,16 +1,15 @@
---- rapid/plugin/x/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+--- rapid/plugin/x/CMakeLists.txt.orig	2017-06-27 11:44:29 UTC
 +++ rapid/plugin/x/CMakeLists.txt
-@@ -91,14 +91,14 @@ ELSE()
+@@ -70,13 +70,14 @@ ELSE()
      ${CMAKE_CURRENT_SOURCE_DIR}/ngs/include
      ${CMAKE_SOURCE_DIR}/include #temporary
-     ${CMAKE_CURRENT_SOURCE_DIR}/include/mysql
+     ${CMAKE_CURRENT_BINARY_DIR}/generated
 -    ${SSL_INCLUDE_DIRS}
 -    ${ZLIB_INCLUDE_DIR}
 +    ${BOOST_INCLUDE_DIR}
    )
  
    INCLUDE_DIRECTORIES(SYSTEM
--    ${BOOST_INCLUDE_DIR}
      ${PROTOBUF_INCLUDE_DIRS}
      ${LIBEVENT_INCLUDE_DIR}
 +    ${SSL_INCLUDE_DIRS}
diff --git a/databases/mysql80-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt b/databases/mysql80-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt
index d968a7daa022..580bf4ce9bbd 100644
--- a/databases/mysql80-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt
@@ -1,18 +1,10 @@
---- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+--- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig	2017-09-21 12:20:03 UTC
 +++ rapid/unittest/gunit/xplugin/CMakeLists.txt
-@@ -65,7 +65,6 @@ ENDIF()
- ADD_DEFINITIONS(${GMOCK_CFLAGS} -DBOOST_ALL_NO_LIB -DBOOST_NO_AUTO_PTR -DUSE_MYSQLX_FULL_PROTO)
- 
- INCLUDE_DIRECTORIES(SYSTEM
--    ${BOOST_INCLUDE_DIR}
-     ${PROTOBUF_INCLUDE_DIRS}
-     ${SSL_INCLUDE_DIRS}
-     ${LIBEVENT_INCLUDE_DIR}
-@@ -75,6 +74,7 @@ INCLUDE_DIRECTORIES(SYSTEM
+@@ -63,6 +63,7 @@ INCLUDE_DIRECTORIES(
+   ${PROJECT_SOURCE_DIR}/include/mysql
+   ${ZLIB_INCLUDE_DIR}
+   ${CMAKE_BINARY_DIR}/rapid/plugin/x/generated/
++  ${BOOST_INCLUDE_DIR}
  )
  
- INCLUDE_DIRECTORIES(
-+  ${BOOST_INCLUDE_DIR}
-   ${CMAKE_SOURCE_DIR}/testing/include
-   ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include
-   ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include/ngs
+ FILE(
diff --git a/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc b/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc
index c33d355fcf0a..2cd15a450ca5 100644
--- a/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc
+++ b/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc
@@ -1,6 +1,6 @@
---- sql/conn_handler/socket_connection.cc.orig	2016-03-28 18:06:12 UTC
+--- sql/conn_handler/socket_connection.cc.orig	2017-06-27 11:44:29 UTC
 +++ sql/conn_handler/socket_connection.cc
-@@ -939,20 +939,23 @@ Channel_info* Mysqld_socket_listener::li
+@@ -903,22 +903,26 @@ Channel_info* Mysqld_socket_listener::li
      signal(SIGCHLD, SIG_DFL);
      request_init(&req, RQ_DAEMON, m_libwrap_name, RQ_FILE,
                   mysql_socket_getfd(connect_sock), NULL);
@@ -22,9 +22,12 @@
 -             "refused connect from %s", eval_client(&req));
 +             "refused connect from %s", my_eval_client(&req));
  
+ #ifdef HAVE_LIBWRAP_PROTOTYPES
+       // Some distros have patched tcpd.h to have proper prototypes
        if (req.sink)
 -        (req.sink)(req.fd);
 +        ((void (*)(int)) (req.sink))(req.fd);
- 
-       mysql_socket_shutdown(listen_sock, SHUT_RDWR);
-       mysql_socket_close(listen_sock);
++
+ #else
+       // Some distros have not patched tcpd.h
+       if (req.sink)
diff --git a/databases/mysql80-server/files/patch-sql_histograms_histogram.h b/databases/mysql80-server/files/patch-sql_histograms_histogram.h
deleted file mode 100644
index 73256070a0a6..000000000000
--- a/databases/mysql80-server/files/patch-sql_histograms_histogram.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- sql/histograms/histogram.h.orig	2017-01-05 16:18:44 UTC
-+++ sql/histograms/histogram.h
-@@ -111,7 +111,7 @@ public:
- 
- // Typedefs.
- template<typename T>
--using value_map_allocator = Memroot_allocator<std::pair<T, ha_rows> >;
-+using value_map_allocator = Memroot_allocator<std::pair<const T, ha_rows> >;
- 
- template<typename T>
- using value_map_type = std::map<T, ha_rows, Histogram_comparator,
diff --git a/databases/mysql80-server/files/patch-sql_histograms_singleton.cc b/databases/mysql80-server/files/patch-sql_histograms_singleton.cc
deleted file mode 100644
index 2682a96b1086..000000000000
--- a/databases/mysql80-server/files/patch-sql_histograms_singleton.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- sql/histograms/singleton.cc.orig	2017-01-05 16:22:30 UTC
-+++ sql/histograms/singleton.cc
-@@ -126,7 +126,7 @@ bool Singleton<T>::histogram_to_json(Jso
- 
- 
- template <class T>
--bool Singleton<T>::create_json_bucket(const std::pair<T, double> &bucket,
-+bool Singleton<T>::create_json_bucket(const std::pair<const T, double> &bucket,
-                                       Json_array *json_bucket)
- {
-   // Value
diff --git a/databases/mysql80-server/files/patch-sql_histograms_singleton.h b/databases/mysql80-server/files/patch-sql_histograms_singleton.h
deleted file mode 100644
index ab5aae1f0edc..000000000000
--- a/databases/mysql80-server/files/patch-sql_histograms_singleton.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- sql/histograms/singleton.h.orig	2017-01-05 16:21:18 UTC
-+++ sql/histograms/singleton.h
-@@ -89,7 +89,7 @@ private:
- 
-   /// The buckets for this histogram [key, cumulative frequency].
-   std::map<const T, double, Histogram_comparator,
--           Memroot_allocator<std::pair<T, double> > > m_buckets;
-+           Memroot_allocator<std::pair<const T, double> > > m_buckets;
- public:
-   /**
-     Singleton constructor.
-@@ -162,7 +162,7 @@ private:
- 
-     @return     true on error, false otherwise
-   */
--  static bool create_json_bucket(const std::pair<T, double> &bucket,
-+  static bool create_json_bucket(const std::pair<const T, double> &bucket,
-                                  Json_array *json_bucket);
- };
- 
diff --git a/databases/mysql80-server/files/patch-sql_json__dom.h b/databases/mysql80-server/files/patch-sql_json__dom.h
deleted file mode 100644
index 54718af16065..000000000000
--- a/databases/mysql80-server/files/patch-sql_json__dom.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- sql/json_dom.h.orig	2017-01-05 16:09:35 UTC
-+++ sql/json_dom.h
-@@ -337,7 +337,7 @@ struct Json_key_comparator
-   Json_object class.
- */
- typedef std::map<std::string, Json_dom *, Json_key_comparator,
--  Malloc_allocator<std::pair<std::string, Json_dom *> > > Json_object_map;
-+  Malloc_allocator<std::pair<const std::string, Json_dom *> > > Json_object_map;
- 
- /**
-   Represents a JSON container value of type "object" (ECMA), type
diff --git a/databases/mysql80-server/files/patch-storage_innobase_buf_buf0buf.cc b/databases/mysql80-server/files/patch-storage_innobase_buf_buf0buf.cc
deleted file mode 100644
index 0a3b1944f50e..000000000000
--- a/databases/mysql80-server/files/patch-storage_innobase_buf_buf0buf.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- storage/innobase/buf/buf0buf.cc.orig	2016-03-28 18:06:12 UTC
-+++ storage/innobase/buf/buf0buf.cc
-@@ -338,7 +338,7 @@ typedef std::map<
- 	const byte*,
- 	buf_chunk_t*,
- 	std::less<const byte*>,
--	ut_allocator<std::pair<const byte*, buf_chunk_t*> > >
-+	ut_allocator<std::pair<const byte* const, buf_chunk_t*> > >
- 	buf_pool_chunk_map_t;
- 
- static buf_pool_chunk_map_t*			buf_chunk_map_reg;
diff --git a/databases/mysql80-server/files/patch-storage_innobase_dict_dict0stats.cc b/databases/mysql80-server/files/patch-storage_innobase_dict_dict0stats.cc
deleted file mode 100644
index 879e91a116fb..000000000000
--- a/databases/mysql80-server/files/patch-storage_innobase_dict_dict0stats.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- storage/innobase/dict/dict0stats.cc.orig	2016-03-28 18:06:12 UTC
-+++ storage/innobase/dict/dict0stats.cc
-@@ -139,7 +139,7 @@ then we would store 5,7,10,11,12 in the 
- typedef std::vector<ib_uint64_t, ut_allocator<ib_uint64_t> >	boundaries_t;
- 
- /** Allocator type used for index_map_t. */
--typedef ut_allocator<std::pair<const char*, dict_index_t*> >
-+typedef ut_allocator<std::pair<const char* const, dict_index_t*> >
- 	index_map_t_allocator;
- 
- /** Auxiliary map used for sorting indexes by name in dict_stats_save(). */
diff --git a/databases/mysql80-server/files/patch-storage_innobase_sync_sync0debug.cc b/databases/mysql80-server/files/patch-storage_innobase_sync_sync0debug.cc
deleted file mode 100644
index b9dbdedf057f..000000000000
--- a/databases/mysql80-server/files/patch-storage_innobase_sync_sync0debug.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- storage/innobase/sync/sync0debug.cc.orig	2016-03-28 18:06:12 UTC
-+++ storage/innobase/sync/sync0debug.cc
-@@ -1702,7 +1702,7 @@ private:
- 		const void*,
- 		File,
- 		std::less<const void*>,
--		ut_allocator<std::pair<const void*, File> > >
-+		ut_allocator<std::pair<const void* const, File> > >
- 		Files;
- 
- 	typedef OSMutex	Mutex;
diff --git a/databases/mysql80-server/files/patch-storage_innobase_trx_trx0purge.cc b/databases/mysql80-server/files/patch-storage_innobase_trx_trx0purge.cc
deleted file mode 100644
index 5b062e2fad03..000000000000
--- a/databases/mysql80-server/files/patch-storage_innobase_trx_trx0purge.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- storage/innobase/trx/trx0purge.cc.orig	2017-01-05 13:57:29 UTC
-+++ storage/innobase/trx/trx0purge.cc
-@@ -1668,7 +1668,7 @@ trx_purge_attach_undo_recs(
- 	using GroupBy = std::map<
- 		table_id_t, purge_node_t::Recs*,
- 		std::less<table_id_t>,
--		mem_heap_allocator<std::pair<table_id_t, purge_node_t::Recs*>>>;
-+		mem_heap_allocator<std::pair<const table_id_t, purge_node_t::Recs*>>>;
- 
- 	GroupBy		group_by{
- 		GroupBy::key_compare{},
diff --git a/databases/mysql80-server/files/patch-storage_innobase_trx_trx0trx.cc b/databases/mysql80-server/files/patch-storage_innobase_trx_trx0trx.cc
deleted file mode 100644
index e6ec64cb5e1f..000000000000
--- a/databases/mysql80-server/files/patch-storage_innobase_trx_trx0trx.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- storage/innobase/trx/trx0trx.cc.orig	2017-01-05 15:43:29 UTC
-+++ storage/innobase/trx/trx0trx.cc
-@@ -63,7 +63,7 @@ typedef std::set<
- typedef std::map<
- 	trx_t*, table_id_set,
- 	std::less<trx_t*>,
--	ut_allocator<table_id_set> >	trx_table_map;
-+	ut_allocator<std::pair<trx_t* const, table_id_set>> >	trx_table_map;
- 
- /** Map of resurrected transactions to affected table_id */
- static trx_table_map	resurrected_trx_tables;
diff --git a/databases/mysql80-server/pkg-plist b/databases/mysql80-server/pkg-plist
index bbb6b12c50cb..efa07564f628 100644
--- a/databases/mysql80-server/pkg-plist
+++ b/databases/mysql80-server/pkg-plist
@@ -14,17 +14,36 @@ bin/mysqldumpslow
 bin/mysqltest
 bin/mysqlxtest
 bin/perror
-bin/replace
 bin/resolve_stack_dump
 bin/resolveip
-lib/mysql/libmysqld.a
 lib/mysql/plugin/adt_null.so
 lib/mysql/plugin/auth.so
 lib/mysql/plugin/auth_test_plugin.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_sink_json.so
+lib/mysql/plugin/component_log_sink_syseventlog.so
+lib/mysql/plugin/component_log_sink_test.so
+lib/mysql/plugin/component_pfs_example_component_population.so
+lib/mysql/plugin/component_test_pfs_notification.so
+lib/mysql/plugin/component_test_pfs_resource_group.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_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/connection_control.so
 lib/mysql/plugin/daemon_example.ini
+lib/mysql/plugin/group_replication.so
 %%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so
 lib/mysql/plugin/keyring_file.so
 lib/mysql/plugin/libdaemon_example.so
@@ -45,6 +64,7 @@ lib/mysql/plugin/libtest_sql_processlist.so
 lib/mysql/plugin/libtest_sql_replication.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
@@ -53,6 +73,7 @@ lib/mysql/plugin/locking_service.so
 lib/mysql/plugin/mypluglib.so
 lib/mysql/plugin/mysql_no_login.so
 lib/mysql/plugin/mysqlx.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
@@ -62,6 +83,7 @@ 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_plugin_registry.so
 lib/mysql/plugin/keyring_udf.so
 lib/mysql/plugin/test_udf_services.so
 lib/mysql/plugin/validate_password.so
@@ -83,7 +105,6 @@ man/man1/mysqldumpslow.1.gz
 man/man1/mysqlman.1.gz
 man/man1/mysqltest.1.gz
 man/man1/perror.1.gz
-man/man1/replace.1.gz
 man/man1/resolve_stack_dump.1.gz
 man/man1/resolveip.1.gz
 man/man8/mysqld.8.gz
@@ -132,10 +153,8 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/japanese/errmsg.sys
 %%DATADIR%%/korean/errmsg.sys
 %%DATADIR%%/magic
-%%DATADIR%%/my-default.cnf
 %%DATADIR%%/mysql-log-rotate
 %%DATADIR%%/mysql.server
-%%DATADIR%%/mysql_security_commands.sql
 %%DATADIR%%/mysql_sys_schema.sql
 %%DATADIR%%/mysql_system_tables.sql
 %%DATADIR%%/mysql_system_tables_data.sql