Index: Makefile
===================================================================
--- Makefile	(revision 515321)
+++ Makefile	(working copy)
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	mysqlwsrep
-PORTVERSION?=	5.7.27
+PORTVERSION?=	5.7.28
 DISTVERSIONPREFIX?=	wsrep_
-DISTVERSIONSUFFIX?=	-25.19
+DISTVERSIONSUFFIX?=	-25.20
 PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES+=	SF/boost/boost/1.59.0:boost
Index: distinfo
===================================================================
--- distinfo	(revision 515321)
+++ distinfo	(working copy)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1567528044
+TIMESTAMP = 1571904382
 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
 SIZE (boost_1_59_0.tar.gz) = 83709983
-SHA256 (codership-mysql-wsrep-wsrep_5.7.27-25.19_GH0.tar.gz) = 2d4907d107fe6ea714a34da7b7e86c9cc7e53a445341ca2bb36e79f917266b16
-SIZE (codership-mysql-wsrep-wsrep_5.7.27-25.19_GH0.tar.gz) = 54689025
+SHA256 (codership-mysql-wsrep-wsrep_5.7.28-25.20_GH0.tar.gz) = ba03e5e35a1e972b3887935e1a13c93c30dfa44bb4d85b5f8dde2f9c982b3ff8
+SIZE (codership-mysql-wsrep-wsrep_5.7.28-25.20_GH0.tar.gz) = 54717971
 SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
 SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032
Index: files/patch-CMakeLists.txt
===================================================================
--- files/patch-CMakeLists.txt	(revision 515321)
+++ files/patch-CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2019-08-30 12:42:21 UTC
+--- CMakeLists.txt.orig	2019-10-21 05:21:41 UTC
 +++ CMakeLists.txt
-@@ -710,12 +710,10 @@ IF(UNIX)
+@@ -730,12 +730,10 @@ IF(UNIX)
  ENDIF()
  
  IF(NOT WITHOUT_SERVER)
@@ -13,7 +13,7 @@
    ENDIF(WITH_EMBEDDED_SERVER)
  ENDIF()
  
-@@ -724,8 +722,6 @@ ENDIF()
+@@ -744,8 +742,6 @@ ENDIF()
  ADD_SUBDIRECTORY(scripts)
  
  IF(NOT WITHOUT_SERVER)
@@ -22,15 +22,15 @@
    ADD_SUBDIRECTORY(support-files)
    IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
      ADD_SUBDIRECTORY(internal)
-@@ -784,6 +780,7 @@ ENDIF()
+@@ -804,6 +800,7 @@ ENDIF()
  #
  # RPM installs documentation directly from the source tree
  #
 +IF(FALSE)
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-   INSTALL(FILES COPYING LICENSE.mysql 
-   DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -807,6 +804,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+   INSTALL(FILES
+     README
+@@ -825,6 +822,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
      PATTERN "mysql.info" EXCLUDE
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
Index: files/patch-client_CMakeLists.txt
===================================================================
--- files/patch-client_CMakeLists.txt	(revision 515321)
+++ files/patch-client_CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
---- client/CMakeLists.txt.orig	2019-07-17 18:38:36 UTC
+--- client/CMakeLists.txt.orig	2019-10-21 05:21:41 UTC
 +++ client/CMakeLists.txt
-@@ -31,8 +31,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+@@ -38,17 +38,17 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
  
  ## Subdirectory with common client code.
  ADD_SUBDIRECTORY(base)
@@ -7,9 +7,6 @@
 -## Subdirectory for mysqlpump code.
 -ADD_SUBDIRECTORY(dump)
  
- ## We will need libeay32.dll and ssleay32.dll when running client executables.
- COPY_OPENSSL_DLLS(copy_openssl_client)
-@@ -40,11 +38,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
  INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
  
  ADD_DEFINITIONS(${SSL_DEFINES})
@@ -23,7 +20,7 @@
  
  IF(NOT WITHOUT_SERVER)
    MYSQL_ADD_EXECUTABLE(mysql_upgrade
-@@ -65,6 +65,7 @@ ADD_DEPENDENCIES(mysqltest GenError)
+@@ -69,6 +69,7 @@ ADD_DEPENDENCIES(mysqltest GenError)
  ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
  TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
  
@@ -31,7 +28,7 @@
  MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
  TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
  
-@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
+@@ -81,10 +82,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
  
  MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
  TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
@@ -44,15 +41,15 @@
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
  ADD_COMPILE_FLAGS(
    mysqlbinlog.cc
-@@ -97,6 +100,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
+@@ -101,6 +104,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
  
  MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
- TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
+ TARGET_LINK_LIBRARIES(mysql_config_editor ${FORCE_SSL_SOLARIS} mysqlclient)
 +ENDIF()
  
  MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
  TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
-@@ -112,9 +116,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
+@@ -116,9 +120,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
    ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
  ENDIF()
  
@@ -64,7 +61,7 @@
  
  # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
  IF(WIN32)
-@@ -123,11 +129,6 @@ ENDIF(WIN32)
+@@ -127,11 +133,6 @@ ENDIF(WIN32)
  
  SET_TARGET_PROPERTIES (
    mysql_plugin
Index: files/patch-cmake_plugin.cmake
===================================================================
--- files/patch-cmake_plugin.cmake	(revision 515321)
+++ files/patch-cmake_plugin.cmake	(working copy)
@@ -1,6 +1,6 @@
---- cmake/plugin.cmake.orig	2019-07-17 18:38:36 UTC
+--- cmake/plugin.cmake.orig	2019-10-21 05:21:41 UTC
 +++ cmake/plugin.cmake
-@@ -275,9 +275,6 @@ MACRO(MYSQL_ADD_PLUGIN)
+@@ -282,9 +282,6 @@ MACRO(MYSQL_ADD_PLUGIN)
        MYSQL_INSTALL_TARGETS(${target}
          DESTINATION ${INSTALL_PLUGINDIR}
          COMPONENT ${INSTALL_COMPONENT})
Index: files/patch-cmake_ssl.cmake
===================================================================
--- files/patch-cmake_ssl.cmake	(revision 515321)
+++ files/patch-cmake_ssl.cmake	(working copy)
@@ -1,6 +1,6 @@
---- cmake/ssl.cmake.orig	2019-07-17 18:38:36 UTC
+--- cmake/ssl.cmake.orig	2019-10-21 05:21:41 UTC
 +++ cmake/ssl.cmake
-@@ -180,6 +180,12 @@ MACRO (MYSQL_CHECK_SSL)
+@@ -202,6 +202,12 @@ MACRO (MYSQL_CHECK_SSL)
         OPENSSL_MAJOR_VERSION STREQUAL "1"
        )
        SET(OPENSSL_FOUND TRUE)
Index: files/patch-include_CMakeLists.txt
===================================================================
--- files/patch-include_CMakeLists.txt	(revision 515321)
+++ files/patch-include_CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
---- include/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+--- include/CMakeLists.txt.orig	2019-10-21 05:21:41 UTC
 +++ include/CMakeLists.txt
-@@ -69,14 +69,13 @@ SET(HEADERS 
+@@ -76,14 +76,13 @@ SET(HEADERS 
    ${HEADERS_GEN_CONFIGURE}
  )
  
Index: files/patch-include_my__compare.h
===================================================================
--- files/patch-include_my__compare.h	(revision 515321)
+++ files/patch-include_my__compare.h	(working copy)
@@ -1,6 +1,6 @@
---- include/my_compare.h.orig	2016-03-28 18:06:12 UTC
+--- include/my_compare.h.orig	2019-10-21 05:21:41 UTC
 +++ include/my_compare.h
-@@ -40,7 +40,7 @@ extern "C" {
+@@ -47,7 +47,7 @@ extern "C" {
    But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
  */
  
Index: files/patch-include_my__thread__os__id.h
===================================================================
--- files/patch-include_my__thread__os__id.h	(revision 515321)
+++ files/patch-include_my__thread__os__id.h	(working copy)
@@ -1,6 +1,6 @@
---- include/my_thread_os_id.h.orig	2019-07-17 18:38:36 UTC
+--- include/my_thread_os_id.h.orig	2019-10-21 05:21:41 UTC
 +++ include/my_thread_os_id.h
-@@ -81,8 +81,12 @@ static inline my_thread_os_id_t my_thread_os_id()
+@@ -88,8 +88,12 @@ static inline my_thread_os_id_t my_thread_os_id()
    return pthread_getthreadid_np();
  #else
  #ifdef HAVE_INTEGER_PTHREAD_SELF
Index: files/patch-include_myisam.h
===================================================================
--- files/patch-include_myisam.h	(revision 515321)
+++ files/patch-include_myisam.h	(working copy)
@@ -1,6 +1,6 @@
---- include/myisam.h.orig	2016-03-28 18:06:12 UTC
+--- include/myisam.h.orig	2019-10-21 05:21:41 UTC
 +++ include/myisam.h
-@@ -45,7 +45,7 @@ extern "C" {
+@@ -52,7 +52,7 @@ extern "C" {
    The following defines can be increased if necessary.
    But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
  */
Index: files/patch-libmysql_CMakeLists.txt
===================================================================
--- files/patch-libmysql_CMakeLists.txt	(revision 515321)
+++ files/patch-libmysql_CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
---- libmysql/CMakeLists.txt.orig       2019-03-22 10:07:57 UTC
+--- libmysql/CMakeLists.txt.orig	2019-10-21 05:21:41 UTC
 +++ libmysql/CMakeLists.txt
-@@ -231,11 +231,11 @@ IF(WIN32)
+@@ -262,11 +262,11 @@ IF(WIN32)
  ENDIF()
  
  # LDAP authentication SASL client plugin
@@ -10,22 +10,23 @@
 +# ADD_SUBDIRECTORY(authentication_ldap)
    
  # Merge several convenience libraries into one big mysqlclient
--MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development)
-+MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development SKIP_INSTALL)
+-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development)
++MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL)
+ TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK})
  
  # Visual Studio users need debug  static library for debug projects
- IF(MSVC)
-@@ -284,7 +284,8 @@ IF(NOT DISABLE_SHARED)
+@@ -312,8 +312,9 @@ IF(NOT DISABLE_SHARED)
    # and link them together into shared library.
-   MERGE_LIBRARIES_SHARED(libmysql ${LIBS}
+   MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
      EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
 -    COMPONENT SharedLibraries)
 +    COMPONENT SharedLibraries SKIP_INSTALL)
-+  IF(FALSE)
+   TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
++  IF (FALSE)
    IF(UNIX)
      # libtool compatability
      IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -328,6 +329,7 @@ IF(NOT DISABLE_SHARED)
+@@ -357,6 +358,7 @@ IF(NOT DISABLE_SHARED)
      SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1)
      SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1)
  
Index: files/patch-libservices_CMakeLists.txt
===================================================================
--- files/patch-libservices_CMakeLists.txt	(revision 515321)
+++ files/patch-libservices_CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
---- libservices/CMakeLists.txt.orig	2019-07-17 18:38:36 UTC
+--- libservices/CMakeLists.txt.orig	2019-10-21 05:21:41 UTC
 +++ libservices/CMakeLists.txt
-@@ -40,4 +40,6 @@ SET(MYSQLSERVICES_SOURCES
+@@ -47,4 +47,6 @@ SET(MYSQLSERVICES_SOURCES
    mysql_keyring_service.c)
  
  ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
Index: files/patch-man_CMakeLists.txt
===================================================================
--- files/patch-man_CMakeLists.txt	(revision 515321)
+++ files/patch-man_CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
---- man/CMakeLists.txt.orig	2019-07-17 18:38:36 UTC
+--- man/CMakeLists.txt.orig	2019-10-21 05:21:41 UTC
 +++ man/CMakeLists.txt
-@@ -14,9 +14,7 @@
+@@ -21,9 +21,7 @@
  # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  
  # Copy man pages
Index: files/patch-mysys__ssl_my__default.cc
===================================================================
--- files/patch-mysys__ssl_my__default.cc	(revision 515321)
+++ files/patch-mysys__ssl_my__default.cc	(working copy)
@@ -1,6 +1,6 @@
---- mysys_ssl/my_default.cc.orig	2019-07-17 18:38:36 UTC
+--- mysys_ssl/my_default.cc.orig	2019-10-21 05:21:41 UTC
 +++ mysys_ssl/my_default.cc
-@@ -120,7 +120,7 @@ char wsrep_defaults_group_suffix[FN_EXTLEN]={0,};
+@@ -132,7 +132,7 @@ char wsrep_defaults_group_suffix[FN_EXTLEN]={0,};
  #endif /* WITH_WREP */
  /* Which directories are searched for options (and in which order) */
  
@@ -9,7 +9,7 @@
  #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
  static const char **default_directories = NULL;
  
-@@ -936,6 +936,14 @@ static int search_default_file_with_ext(Process_option
+@@ -948,6 +948,14 @@ static int search_default_file_with_ext(Process_option
      strncpy(wsrep_defaults_file, name, sizeof(wsrep_defaults_file) - 1);
  #endif /* WITH_WSREP */
  
@@ -24,7 +24,7 @@
    while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
    {
      line++;
-@@ -1274,7 +1282,8 @@ void my_print_default_files(const char *conf_file)
+@@ -1286,7 +1294,8 @@ void my_print_default_files(const char *conf_file)
              end[(strlen(end)-1)] = ' ';
            else
              strxmov(end, conf_file, *ext , " ",  NullS);
@@ -34,7 +34,7 @@
          }
        }
      }
-@@ -1433,14 +1442,9 @@ static const char **init_default_directories(MEM_ROOT 
+@@ -1445,14 +1454,9 @@ static const char **init_default_directories(MEM_ROOT 
  
  #else
  
@@ -51,7 +51,7 @@
  #endif
  
    if ((env= getenv("MYSQL_HOME")))
-@@ -1510,7 +1514,7 @@ int check_file_permissions(const char *file_name, my_b
+@@ -1522,7 +1526,7 @@ int check_file_permissions(const char *file_name, my_b
    MY_STAT stat_info;
  
    if (!my_stat(file_name,&stat_info,MYF(0)))
Index: files/patch-plugin_password__validation_validate__password.cc
===================================================================
--- files/patch-plugin_password__validation_validate__password.cc	(revision 515321)
+++ files/patch-plugin_password__validation_validate__password.cc	(working copy)
@@ -1,6 +1,6 @@
---- plugin/password_validation/validate_password.cc.orig	2016-03-28 18:06:12 UTC
+--- plugin/password_validation/validate_password.cc.orig	2019-10-21 05:21:41 UTC
 +++ plugin/password_validation/validate_password.cc
-@@ -18,6 +18,8 @@
+@@ -25,6 +25,8 @@
  #include <mysql/plugin_validate_password.h>
  #include <mysql/service_my_plugin_log.h>
  #include <mysql/service_mysql_string.h>
Index: files/patch-rapid_plugin_x_mysqlx__configure.cmake
===================================================================
--- files/patch-rapid_plugin_x_mysqlx__configure.cmake	(revision 515321)
+++ files/patch-rapid_plugin_x_mysqlx__configure.cmake	(working copy)
@@ -1,6 +1,6 @@
---- rapid/plugin/x/mysqlx_configure.cmake.orig	2019-07-17 18:38:36 UTC
+--- rapid/plugin/x/mysqlx_configure.cmake.orig	2019-10-21 05:21:41 UTC
 +++ rapid/plugin/x/mysqlx_configure.cmake
-@@ -35,6 +35,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_ername
+@@ -42,6 +42,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_ername
  CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_version.h.in
                 ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h )
  
@@ -8,7 +8,7 @@
  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_error.h
          DESTINATION ${INSTALL_INCLUDEDIR}
          COMPONENT Developement)
-@@ -46,3 +47,4 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/my
+@@ -53,3 +54,4 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/my
  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h
          DESTINATION ${INSTALL_INCLUDEDIR}
          COMPONENT Developement)
Index: files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt
===================================================================
--- files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt	(revision 515321)
+++ files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
---- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig	2019-07-17 18:38:36 UTC
+--- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig	2019-10-21 05:21:41 UTC
 +++ rapid/unittest/gunit/xplugin/CMakeLists.txt
-@@ -71,7 +71,6 @@ ADD_DEFINITIONS(
+@@ -78,7 +78,6 @@ ADD_DEFINITIONS(
  )
  
  INCLUDE_DIRECTORIES(SYSTEM
@@ -8,7 +8,7 @@
      ${PROTOBUF_INCLUDE_DIRS}
      ${SSL_INCLUDE_DIRS}
      ${LIBEVENT_INCLUDE_DIRS}
-@@ -81,6 +80,7 @@ INCLUDE_DIRECTORIES(SYSTEM
+@@ -88,6 +87,7 @@ INCLUDE_DIRECTORIES(SYSTEM
  )
  
  INCLUDE_DIRECTORIES(
Index: files/patch-scripts_CMakeLists.txt
===================================================================
--- files/patch-scripts_CMakeLists.txt	(revision 515321)
+++ files/patch-scripts_CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
---- scripts/CMakeLists.txt.orig	2019-08-30 12:42:21 UTC
+--- scripts/CMakeLists.txt.orig	2019-10-21 05:21:41 UTC
 +++ scripts/CMakeLists.txt
-@@ -326,6 +326,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
+@@ -333,6 +333,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} " )
@@ -9,7 +9,7 @@
          ELSE()
            SET(${var} "${${var}}-l${lib} " )
          ENDIF()
-@@ -411,14 +413,13 @@ ELSE()
+@@ -418,14 +420,13 @@ ELSE()
    # On Unix, most of the files end up in the bin directory
    SET(mysql_config_COMPONENT COMPONENT Development)
  
@@ -25,7 +25,7 @@
        mysqldumpslow
        mysqld_multi
        mysqld_safe
-@@ -462,7 +463,7 @@ ELSE()
+@@ -469,7 +470,7 @@ ELSE()
    FOREACH(file ${BIN_SCRIPTS})
      IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
        CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
Index: files/patch-sql_CMakeLists.txt
===================================================================
--- files/patch-sql_CMakeLists.txt	(revision 515321)
+++ files/patch-sql_CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
---- sql/CMakeLists.txt.orig	2019-07-17 18:38:36 UTC
+--- sql/CMakeLists.txt.orig	2019-10-21 05:21:41 UTC
 +++ sql/CMakeLists.txt
-@@ -22,6 +22,8 @@ INCLUDE_DIRECTORIES(
+@@ -29,6 +29,8 @@ INCLUDE_DIRECTORIES(
    ${CMAKE_SOURCE_DIR}/regex 
    ${SSL_INCLUDE_DIRS}
    ${CMAKE_BINARY_DIR}/sql
@@ -9,7 +9,7 @@
    ${WSREP_INCLUDES}
    ${LZ4_INCLUDE_DIR}
  )
-@@ -636,6 +638,7 @@ ADD_CUSTOM_TARGET( 
+@@ -647,6 +649,7 @@ ADD_CUSTOM_TARGET( 
  )
  
  
@@ -17,7 +17,7 @@
  MYSQL_ADD_PLUGIN(udf_example udf_example.cc
                   MODULE_ONLY TEST_ONLY MODULE_OUTPUT_NAME "udf_example")
  IF(NOT DISABLE_SHARED)
-@@ -644,6 +647,7 @@ IF(NOT DISABLE_SHARED)
+@@ -655,6 +658,7 @@ IF(NOT DISABLE_SHARED)
        PROPERTIES LINK_FLAGS
        "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def")
    ENDIF()
Index: files/patch-sql_conn__handler_socket__connection.cc
===================================================================
--- files/patch-sql_conn__handler_socket__connection.cc	(revision 515321)
+++ files/patch-sql_conn__handler_socket__connection.cc	(working copy)
@@ -1,6 +1,6 @@
---- sql/conn_handler/socket_connection.cc.orig	2019-07-17 18:38:36 UTC
+--- sql/conn_handler/socket_connection.cc.orig	2019-10-21 05:21:41 UTC
 +++ sql/conn_handler/socket_connection.cc
-@@ -946,22 +946,25 @@ Channel_info* Mysqld_socket_listener::listen_for_conne
+@@ -953,22 +953,25 @@ Channel_info* Mysqld_socket_listener::listen_for_conne
      signal(SIGCHLD, SIG_DFL);
      request_init(&req, RQ_DAEMON, m_libwrap_name, RQ_FILE,
                   mysql_socket_getfd(connect_sock), NULL);
Index: files/patch-sql_sys__vars.cc
===================================================================
--- files/patch-sql_sys__vars.cc	(revision 515321)
+++ files/patch-sql_sys__vars.cc	(working copy)
@@ -1,6 +1,6 @@
---- sql/sys_vars.cc.orig	2019-07-17 18:38:36 UTC
+--- sql/sys_vars.cc.orig	2019-10-21 05:21:41 UTC
 +++ sql/sys_vars.cc
-@@ -1741,7 +1741,7 @@ static Sys_var_ulong Sys_interactive_timeout(
+@@ -1748,7 +1748,7 @@ static Sys_var_ulong Sys_interactive_timeout(
         "connection before closing it",
         SESSION_VAR(net_interactive_timeout),
         CMD_LINE(REQUIRED_ARG),
@@ -9,7 +9,7 @@
  
  static Sys_var_ulong Sys_join_buffer_size(
         "join_buffer_size",
-@@ -2621,7 +2621,7 @@ static Sys_var_ulong Sys_net_read_timeout(
+@@ -2628,7 +2628,7 @@ static Sys_var_ulong Sys_net_read_timeout(
         "Number of seconds to wait for more data from a connection before "
         "aborting the read",
         SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
@@ -18,7 +18,7 @@
         NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
         ON_UPDATE(fix_net_read_timeout));
  
-@@ -2645,7 +2645,7 @@ static Sys_var_ulong Sys_net_write_timeout(
+@@ -2652,7 +2652,7 @@ static Sys_var_ulong Sys_net_write_timeout(
         "Number of seconds to wait for a block to be written to a connection "
         "before aborting the write",
         SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
@@ -27,7 +27,7 @@
         NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
         ON_UPDATE(fix_net_write_timeout));
  
-@@ -4369,7 +4369,7 @@ static Sys_var_ulong Sys_net_wait_timeout(
+@@ -4372,7 +4372,7 @@ static Sys_var_ulong Sys_net_wait_timeout(
         "The number of seconds the server waits for activity on a "
         "connection before closing it",
         SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
Index: files/patch-storage_innobase_include_srv0mon.h
===================================================================
--- files/patch-storage_innobase_include_srv0mon.h	(revision 515321)
+++ files/patch-storage_innobase_include_srv0mon.h	(working copy)
@@ -1,6 +1,6 @@
---- storage/innobase/include/srv0mon.h.orig	2016-03-28 18:06:12 UTC
+--- storage/innobase/include/srv0mon.h.orig	2019-10-21 05:21:41 UTC
 +++ storage/innobase/include/srv0mon.h
-@@ -34,6 +34,10 @@ Created 12/15/2009	Jimmy Yang
+@@ -41,6 +41,10 @@ Created 12/15/2009	Jimmy Yang
  /* Required for FreeBSD so that INT64_MAX is defined. */
  #define __STDC_LIMIT_MACROS
  #endif /* __STDC_LIMIT_MACROS */
Index: files/patch-storage_myisam_mi__dynrec.c
===================================================================
--- files/patch-storage_myisam_mi__dynrec.c	(revision 515321)
+++ files/patch-storage_myisam_mi__dynrec.c	(working copy)
@@ -1,6 +1,6 @@
---- storage/myisam/mi_dynrec.c.orig	2016-03-28 18:06:12 UTC
+--- storage/myisam/mi_dynrec.c.orig	2019-10-21 05:21:41 UTC
 +++ storage/myisam/mi_dynrec.c
-@@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my
+@@ -72,18 +72,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my_off_t size)
      DBUG_RETURN(1);
    }
    /*
Index: files/patch-support-files_CMakeLists.txt
===================================================================
--- files/patch-support-files_CMakeLists.txt	(revision 515321)
+++ files/patch-support-files_CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
---- support-files/CMakeLists.txt.orig	2019-07-17 18:38:36 UTC
+--- support-files/CMakeLists.txt.orig	2019-10-21 05:21:41 UTC
 +++ support-files/CMakeLists.txt
-@@ -60,7 +60,9 @@ IF(UNIX)
+@@ -67,7 +67,9 @@ IF(UNIX)
      INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
    ENDIF()