databases/mysqlwsrep57-server: Upgrade from 5.7.25 to 5.7.26

PR:		239374
Submitted by:	Teemu Ollakka <teemu.ollakka@galeracluster.com>

17 files changed, 95 insertions, 75 deletions

diff --git a/databases/mysqlwsrep57-server/Makefile b/databases/mysqlwsrep57-server/Makefile
index 9986fad4ab92..41c6c41aa1e4 100644
--- a/databases/mysqlwsrep57-server/Makefile
+++ b/databases/mysqlwsrep57-server/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	mysqlwsrep
-PORTVERSION?=	5.7.25
+PORTVERSION?=	5.7.26
 DISTVERSIONPREFIX?=	wsrep_
-DISTVERSIONSUFFIX?=	-25.17
+DISTVERSIONSUFFIX?=	-25.18
 CATEGORIES=	databases ipv6
 MASTER_SITES+=	SF/boost/boost/1.59.0:boost
 PKGNAMESUFFIX=	57-server
@@ -54,6 +54,7 @@ CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
 		-DINSTALL_INCLUDEDIR="include/mysql" \
 		-DINSTALL_INFODIR="info" \
+		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
 		-DINSTALL_LIBDIR="lib/mysql" \
 		-DINSTALL_MANDIR="man" \
 		-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
diff --git a/databases/mysqlwsrep57-server/distinfo b/databases/mysqlwsrep57-server/distinfo
index a0f4203c10c8..23599ce4e348 100644
--- a/databases/mysqlwsrep57-server/distinfo
+++ b/databases/mysqlwsrep57-server/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1555424200
+TIMESTAMP = 1563530272
 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
 SIZE (boost_1_59_0.tar.gz) = 83709983
-SHA256 (codership-mysql-wsrep-wsrep_5.7.25-25.17_GH0.tar.gz) = 87c1ef4277a60c36166b737813d4898ace7797870fa813d514107133ea257260
-SIZE (codership-mysql-wsrep-wsrep_5.7.25-25.17_GH0.tar.gz) = 52350103
+SHA256 (codership-mysql-wsrep-wsrep_5.7.26-25.18_GH0.tar.gz) = 91d44918284e2f8e5ec7aabbf15e0c7ccefefd32a7a0206494d16ea8216098fc
+SIZE (codership-mysql-wsrep-wsrep_5.7.26-25.18_GH0.tar.gz) = 54333146
 SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
 SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032
diff --git a/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt
index fe05a9c83935..ee57c92ab667 100644
--- a/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt
+++ b/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+--- CMakeLists.txt.orig	2019-07-17 18:38:36 UTC
 +++ CMakeLists.txt
-@@ -614,12 +614,10 @@ IF(UNIX)
+@@ -691,12 +691,10 @@ IF(UNIX)
  ENDIF()
  
  IF(NOT WITHOUT_SERVER)
@@ -13,7 +13,7 @@
    ENDIF(WITH_EMBEDDED_SERVER)
  ENDIF()
  
-@@ -628,8 +626,6 @@ ENDIF()
+@@ -705,8 +703,6 @@ ENDIF()
  ADD_SUBDIRECTORY(scripts)
  
  IF(NOT WITHOUT_SERVER)
@@ -22,7 +22,7 @@
    ADD_SUBDIRECTORY(support-files)
    IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
      ADD_SUBDIRECTORY(internal)
-@@ -684,6 +680,7 @@ ENDIF()
+@@ -765,6 +761,7 @@ ENDIF()
  #
  # RPM installs documentation directly from the source tree
  #
@@ -30,11 +30,11 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -706,6 +703,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+@@ -788,6 +785,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+     PATTERN "mysql.info" EXCLUDE
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
- ENDIF()
 +ENDIF()
+ ENDIF()
  
  INCLUDE(CPack)
- 
diff --git a/databases/mysqlwsrep57-server/files/patch-client_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-client_CMakeLists.txt
index 03549e41d244..b1f89050a4c7 100644
--- a/databases/mysqlwsrep57-server/files/patch-client_CMakeLists.txt
+++ b/databases/mysqlwsrep57-server/files/patch-client_CMakeLists.txt
@@ -1,6 +1,6 @@
---- client/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+--- client/CMakeLists.txt.orig	2019-07-17 18:38:36 UTC
 +++ client/CMakeLists.txt
-@@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
+@@ -31,8 +31,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
  
  ## Subdirectory with common client code.
  ADD_SUBDIRECTORY(base)
@@ -9,7 +9,7 @@
  
  ## We will need libeay32.dll and ssleay32.dll when running client executables.
  COPY_OPENSSL_DLLS(copy_openssl_client)
-@@ -41,11 +39,13 @@ 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 +23,7 @@
  
  IF(NOT WITHOUT_SERVER)
    MYSQL_ADD_EXECUTABLE(mysql_upgrade
-@@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
+@@ -65,6 +65,7 @@ ADD_DEPENDENCIES(mysqltest GenError)
  ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
  TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
  
@@ -31,7 +31,7 @@
  MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
  TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
  
-@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
+@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
  
  MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
  TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
@@ -44,7 +44,7 @@
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
  ADD_COMPILE_FLAGS(
    mysqlbinlog.cc
-@@ -97,6 +100,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
+@@ -97,6 +100,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
  
  MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
  TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
diff --git a/databases/mysqlwsrep57-server/files/patch-cmake_plugin.cmake b/databases/mysqlwsrep57-server/files/patch-cmake_plugin.cmake
index 65d4bc2b4d31..9e3e4b586b3a 100644
--- a/databases/mysqlwsrep57-server/files/patch-cmake_plugin.cmake
+++ b/databases/mysqlwsrep57-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	2019-07-17 18:38:36 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"
+@@ -275,9 +275,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"
diff --git a/databases/mysqlwsrep57-server/files/patch-cmake_ssl.cmake b/databases/mysqlwsrep57-server/files/patch-cmake_ssl.cmake
index c9a66c421b23..4be1d2e8d48c 100644
--- a/databases/mysqlwsrep57-server/files/patch-cmake_ssl.cmake
+++ b/databases/mysqlwsrep57-server/files/patch-cmake_ssl.cmake
@@ -1,6 +1,6 @@
---- cmake/ssl.cmake.orig	2016-08-12 10:55:07 UTC
+--- cmake/ssl.cmake.orig	2019-07-17 18:38:36 UTC
 +++ cmake/ssl.cmake
-@@ -179,6 +179,12 @@ MACRO (MYSQL_CHECK_SSL)
+@@ -180,6 +180,12 @@ MACRO (MYSQL_CHECK_SSL)
         OPENSSL_MAJOR_VERSION STREQUAL "1"
        )
        SET(OPENSSL_FOUND TRUE)
diff --git a/databases/mysqlwsrep57-server/files/patch-include_my__thread__os__id.h b/databases/mysqlwsrep57-server/files/patch-include_my__thread__os__id.h
index 60b111b88a10..694384a8d1b1 100644
--- a/databases/mysqlwsrep57-server/files/patch-include_my__thread__os__id.h
+++ b/databases/mysqlwsrep57-server/files/patch-include_my__thread__os__id.h
@@ -1,6 +1,6 @@
---- include/my_thread_os_id.h.orig	2016-03-28 18:06:12 UTC
+--- include/my_thread_os_id.h.orig	2019-07-17 18:38:36 UTC
 +++ include/my_thread_os_id.h
-@@ -75,8 +75,12 @@ static inline my_thread_os_id_t my_threa
+@@ -81,8 +81,12 @@ static inline my_thread_os_id_t my_thread_os_id()
    return pthread_getthreadid_np();
  #else
  #ifdef HAVE_INTEGER_PTHREAD_SELF
diff --git a/databases/mysqlwsrep57-server/files/patch-libservices_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-libservices_CMakeLists.txt
index bfd6118b5648..3487a9f88f86 100644
--- a/databases/mysqlwsrep57-server/files/patch-libservices_CMakeLists.txt
+++ b/databases/mysqlwsrep57-server/files/patch-libservices_CMakeLists.txt
@@ -1,6 +1,6 @@
---- libservices/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+--- libservices/CMakeLists.txt.orig	2019-07-17 18:38:36 UTC
 +++ libservices/CMakeLists.txt
-@@ -35,4 +35,6 @@ SET(MYSQLSERVICES_SOURCES
+@@ -40,4 +40,6 @@ SET(MYSQLSERVICES_SOURCES
    mysql_keyring_service.c)
  
  ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
diff --git a/databases/mysqlwsrep57-server/files/patch-man_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-man_CMakeLists.txt
index b771ae6214f0..4c7eb8cccfcd 100644
--- a/databases/mysqlwsrep57-server/files/patch-man_CMakeLists.txt
+++ b/databases/mysqlwsrep57-server/files/patch-man_CMakeLists.txt
@@ -1,11 +1,13 @@
---- man/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- man/CMakeLists.txt.orig	2019-07-17 18:38:36 UTC
 +++ man/CMakeLists.txt
-@@ -15,8 +15,6 @@
+@@ -14,9 +14,7 @@
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  
  # Copy man pages
- FILE(GLOB MAN1_FILES *.1)
+-FILE(GLOB MAN1_FILES *.1)
 -FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
 -FILE(GLOB MAN1_NDB ndb*.1)
++FILE(GLOB MAN1_FILES 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  perror.1  replace.1  resolve_stack_dump.1  resolveip.1)
  FILE(GLOB MAN8_FILES *.8)
  FILE(GLOB MAN8_NDB ndb*.8)
  IF(MAN1_FILES)
diff --git a/databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc b/databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc
index ea05679341fa..b175f85fc7d2 100644
--- a/databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc
+++ b/databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc
@@ -1,7 +1,7 @@
---- mysys_ssl/my_default.cc.orig	2016-08-25 11:52:06 UTC
+--- mysys_ssl/my_default.cc.orig	2019-07-17 18:38:36 UTC
 +++ mysys_ssl/my_default.cc
-@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA
- 
+@@ -120,7 +120,7 @@ char wsrep_defaults_group_suffix[FN_EXTLEN]={0,};
+ #endif /* WITH_WREP */
  /* Which directories are searched for options (and in which order) */
  
 -#define MAX_DEFAULT_DIRS 6
@@ -9,9 +9,9 @@
  #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
  static const char **default_directories = NULL;
  
-@@ -914,6 +914,14 @@ static int search_default_file_with_ext(
-       return 1;                                 /* Ignore wrong files */
-   }
+@@ -936,6 +936,14 @@ static int search_default_file_with_ext(Process_option
+     strncpy(wsrep_defaults_file, name, sizeof(wsrep_defaults_file) - 1);
+ #endif /* WITH_WSREP */
  
 +  if (strstr(name, "/etc") == name)
 +  {
@@ -24,7 +24,7 @@
    while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
    {
      line++;
-@@ -1252,7 +1260,8 @@ void my_print_default_files(const char *
+@@ -1274,7 +1282,8 @@ void my_print_default_files(const char *conf_file)
              end[(strlen(end)-1)] = ' ';
            else
              strxmov(end, conf_file, *ext , " ",  NullS);
@@ -34,23 +34,24 @@
          }
        }
      }
-@@ -1411,13 +1420,8 @@ static const char **init_default_directo
+@@ -1433,14 +1442,9 @@ static const char **init_default_directories(MEM_ROOT 
  
  #else
  
 -  errors += add_directory(alloc, "/etc/", dirs);
 -  errors += add_directory(alloc, "/etc/mysql/", dirs);
--
++  errors += add_directory(alloc, "/usr/local/etc/", dirs);
++  errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
+ 
 -#if defined(DEFAULT_SYSCONFDIR)
 -  if (DEFAULT_SYSCONFDIR[0])
 -    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
 -#endif /* DEFAULT_SYSCONFDIR */
-+  errors += add_directory(alloc, "/usr/local/etc/", dirs);
-+  errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
- 
+-
  #endif
  
-@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f
+   if ((env= getenv("MYSQL_HOME")))
+@@ -1510,7 +1514,7 @@ int check_file_permissions(const char *file_name, my_b
    MY_STAT stat_info;
  
    if (!my_stat(file_name,&stat_info,MYF(0)))
diff --git a/databases/mysqlwsrep57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake b/databases/mysqlwsrep57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake
index 52828f00f631..f2805aefa1dd 100644
--- a/databases/mysqlwsrep57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake
+++ b/databases/mysqlwsrep57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake
@@ -1,6 +1,6 @@
---- rapid/plugin/x/mysqlx_configure.cmake.orig	2016-09-14 15:25:26 UTC
+--- rapid/plugin/x/mysqlx_configure.cmake.orig	2019-07-17 18:38:36 UTC
 +++ rapid/plugin/x/mysqlx_configure.cmake
-@@ -29,6 +29,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src
+@@ -35,6 +35,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)
-@@ -36,3 +37,4 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR
+@@ -46,3 +47,4 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/my
  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h
          DESTINATION ${INSTALL_INCLUDEDIR}
          COMPONENT Developement)
diff --git a/databases/mysqlwsrep57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt
index d968a7daa022..b389e1d3307d 100644
--- a/databases/mysqlwsrep57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt
+++ b/databases/mysqlwsrep57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt
@@ -1,14 +1,14 @@
---- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+--- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig	2019-07-17 18:38:36 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)
+@@ -71,7 +71,6 @@ ADD_DEFINITIONS(
+ )
  
  INCLUDE_DIRECTORIES(SYSTEM
 -    ${BOOST_INCLUDE_DIR}
      ${PROTOBUF_INCLUDE_DIRS}
      ${SSL_INCLUDE_DIRS}
-     ${LIBEVENT_INCLUDE_DIR}
-@@ -75,6 +74,7 @@ INCLUDE_DIRECTORIES(SYSTEM
+     ${LIBEVENT_INCLUDE_DIRS}
+@@ -81,6 +80,7 @@ INCLUDE_DIRECTORIES(SYSTEM
  )
  
  INCLUDE_DIRECTORIES(
diff --git a/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt
index b8481a0aed4e..80a09c5e0515 100644
--- a/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt
+++ b/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt
@@ -1,6 +1,6 @@
---- scripts/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+--- scripts/CMakeLists.txt.orig	2019-07-17 18:38:36 UTC
 +++ scripts/CMakeLists.txt
-@@ -347,6 +347,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
+@@ -324,6 +324,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()
-@@ -430,14 +432,13 @@ ELSE()
+@@ -409,14 +411,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
-@@ -471,7 +472,7 @@ ELSE()
+@@ -460,7 +461,7 @@ ELSE()
    FOREACH(file ${BIN_SCRIPTS})
      IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
        CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
diff --git a/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt
index 9c403bb74fc8..ccf5191cbf91 100644
--- a/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt
+++ b/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt
@@ -1,7 +1,7 @@
---- sql/CMakeLists.txt.orig	2017-06-12 10:31:29 UTC
+--- sql/CMakeLists.txt.orig	2019-07-17 18:38:36 UTC
 +++ sql/CMakeLists.txt
-@@ -28,6 +28,8 @@ INCLUDE_DIRECTORIES(
-   ${ZLIB_INCLUDE_DIR}
+@@ -22,6 +22,8 @@ INCLUDE_DIRECTORIES(
+   ${CMAKE_SOURCE_DIR}/regex 
    ${SSL_INCLUDE_DIRS}
    ${CMAKE_BINARY_DIR}/sql
 +  ${CMAKE_BINARY_DIR}/include
@@ -9,3 +9,19 @@
    ${WSREP_INCLUDES}
    ${LZ4_INCLUDE_DIR}
  )
+@@ -636,6 +638,7 @@ ADD_CUSTOM_TARGET( 
+ )
+ 
+ 
++IF(FALSE)
+ 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)
+       PROPERTIES LINK_FLAGS
+       "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def")
+   ENDIF()
++ENDIF()
+ ENDIF()
+ 
+ MYSQL_ADD_PLUGIN(locking_service locking_service_udf.cc
diff --git a/databases/mysqlwsrep57-server/files/patch-sql_conn__handler_socket__connection.cc b/databases/mysqlwsrep57-server/files/patch-sql_conn__handler_socket__connection.cc
index 2b5e80a44574..50a1e407ea70 100644
--- a/databases/mysqlwsrep57-server/files/patch-sql_conn__handler_socket__connection.cc
+++ b/databases/mysqlwsrep57-server/files/patch-sql_conn__handler_socket__connection.cc
@@ -1,6 +1,6 @@
---- sql/conn_handler/socket_connection.cc.orig	2017-03-18 07:45:14 UTC
+--- sql/conn_handler/socket_connection.cc.orig	2019-07-17 18:38:36 UTC
 +++ sql/conn_handler/socket_connection.cc
-@@ -942,22 +942,25 @@ Channel_info* Mysqld_socket_listener::li
+@@ -946,22 +946,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);
diff --git a/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc b/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc
index e21d62430970..1ee60cfb8afc 100644
--- a/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc
+++ b/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc
@@ -1,6 +1,6 @@
---- sql/sys_vars.cc.orig	2016-03-28 18:06:12 UTC
+--- sql/sys_vars.cc.orig	2019-07-17 18:38:36 UTC
 +++ sql/sys_vars.cc
-@@ -1734,7 +1734,7 @@ static Sys_var_ulong Sys_interactive_tim
+@@ -1741,7 +1741,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",
-@@ -2552,7 +2552,7 @@ static Sys_var_ulong Sys_net_read_timeou
+@@ -2621,7 +2621,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));
  
-@@ -2568,7 +2568,7 @@ static Sys_var_ulong Sys_net_write_timeo
+@@ -2645,7 +2645,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));
  
-@@ -4083,7 +4083,7 @@ static Sys_var_ulong Sys_net_wait_timeou
+@@ -4369,7 +4369,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),
diff --git a/databases/mysqlwsrep57-server/files/patch-support-files_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-support-files_CMakeLists.txt
index 1d1999212ed5..92dcc73599d8 100644
--- a/databases/mysqlwsrep57-server/files/patch-support-files_CMakeLists.txt
+++ b/databases/mysqlwsrep57-server/files/patch-support-files_CMakeLists.txt
@@ -1,6 +1,6 @@
---- support-files/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+--- support-files/CMakeLists.txt.orig	2019-07-17 18:38:36 UTC
 +++ support-files/CMakeLists.txt
-@@ -69,7 +69,9 @@ IF(UNIX)
+@@ -60,7 +60,9 @@ IF(UNIX)
      INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
    ENDIF()