6 files changed, 28 insertions, 35 deletions

diff --git a/databases/mysql80-client/files/patch-client_CMakeLists.txt b/databases/mysql80-client/files/patch-client_CMakeLists.txt
index 6a8f9eb39dad..15ec0ab1a359 100644
--- a/databases/mysql80-client/files/patch-client_CMakeLists.txt
+++ b/databases/mysql80-client/files/patch-client_CMakeLists.txt
@@ -1,29 +1,31 @@
---- 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)
  
diff --git a/databases/mysql80-client/files/patch-include_CMakeLists.txt b/databases/mysql80-client/files/patch-include_CMakeLists.txt
index 59e4a3388fef..5fa5ea35eb42 100644
--- a/databases/mysql80-client/files/patch-include_CMakeLists.txt
+++ b/databases/mysql80-client/files/patch-include_CMakeLists.txt
@@ -3,7 +3,7 @@
 @@ -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
diff --git a/databases/mysql80-client/files/patch-scripts_CMakeLists.txt b/databases/mysql80-client/files/patch-scripts_CMakeLists.txt
index 42f0981daadf..70b6be73fb7a 100644
--- a/databases/mysql80-client/files/patch-scripts_CMakeLists.txt
+++ b/databases/mysql80-client/files/patch-scripts_CMakeLists.txt
@@ -5,11 +5,11 @@
  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()
diff --git a/databases/mysql80-client/files/patch-sql_mysqld.cc b/databases/mysql80-client/files/patch-sql_mysqld.cc
index 3fa4db93f9c5..e6984955312a 100644
--- a/databases/mysql80-client/files/patch-sql_mysqld.cc
+++ b/databases/mysql80-client/files/patch-sql_mysqld.cc
@@ -2,19 +2,10 @@
 +++ 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,
diff --git a/databases/mysql80-client/files/patch-support-files_CMakeLists.txt b/databases/mysql80-client/files/patch-support-files_CMakeLists.txt
index 198e56776eb8..006e36145e26 100644
--- a/databases/mysql80-client/files/patch-support-files_CMakeLists.txt
+++ b/databases/mysql80-client/files/patch-support-files_CMakeLists.txt
@@ -8,10 +8,10 @@
    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()
  
diff --git a/databases/mysql80-client/pkg-plist b/databases/mysql80-client/pkg-plist
index dd95baf130bc..c9f72d346d6f 100644
--- a/databases/mysql80-client/pkg-plist
+++ b/databases/mysql80-client/pkg-plist
@@ -12,13 +12,13 @@ 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