Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 22 Jul 2019 15:34:38 +0000 (UTC)
From:      Vasil Dimov <vd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r507145 - in head/databases/mysqlwsrep56-server: . files
Message-ID:  <201907221534.x6MFYc7a049245@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vd
Date: Mon Jul 22 15:34:37 2019
New Revision: 507145
URL: https://svnweb.freebsd.org/changeset/ports/507145

Log:
  databases/mysqlwsrep56-server: Upgrade from 5.6.43 to 5.6.44
  
  PR:		239373
  Submitted by:	Teemu Ollakka <teemu.ollakka@galeracluster.com>

Modified:
  head/databases/mysqlwsrep56-server/Makefile
  head/databases/mysqlwsrep56-server/distinfo
  head/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt
  head/databases/mysqlwsrep56-server/files/patch-PR225888.diff
  head/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt
  head/databases/mysqlwsrep56-server/files/patch-cmake_plugin.cmake
  head/databases/mysqlwsrep56-server/files/patch-extra_CMakeLists.txt
  head/databases/mysqlwsrep56-server/files/patch-include_my__compare.h
  head/databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc
  head/databases/mysqlwsrep56-server/files/patch-plugin_password__validation_validate__password.cc
  head/databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt
  head/databases/mysqlwsrep56-server/files/patch-scripts_mysqld__safe.sh
  head/databases/mysqlwsrep56-server/files/patch-sql_CMakeLists.txt
  head/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc
  head/databases/mysqlwsrep56-server/files/patch-support-files_CMakeLists.txt

Modified: head/databases/mysqlwsrep56-server/Makefile
==============================================================================
--- head/databases/mysqlwsrep56-server/Makefile	Mon Jul 22 14:36:43 2019	(r507144)
+++ head/databases/mysqlwsrep56-server/Makefile	Mon Jul 22 15:34:37 2019	(r507145)
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	mysqlwsrep
-PORTVERSION?=	5.6.43
+PORTVERSION?=	5.6.44
 DISTVERSIONPREFIX?=	wsrep_
-DISTVERSIONSUFFIX?=	-25.25
+DISTVERSIONSUFFIX?=	-25.26
 CATEGORIES=	databases ipv6
 PKGNAMESUFFIX=	56-server
 
@@ -23,8 +23,8 @@ RUN_DEPENDS=	bash:shells/bash \
 		socat:net/socat
 LIB_DEPENDS=	libevent.so:devel/libevent liblz4.so:archivers/liblz4
 
-BROKEN_SSL=	openssl111
-BROKEN_SSL_REASON_openssl111=	incomplete definition of type 'struct dh_st'
+#BROKEN_SSL=	openssl111
+#BROKEN_SSL_REASON_openssl111=	incomplete definition of type 'struct dh_st'
 
 DATADIR=	${PREFIX}/share/mysql
 ETCDIR=		${PREFIX}/etc/mysql

Modified: head/databases/mysqlwsrep56-server/distinfo
==============================================================================
--- head/databases/mysqlwsrep56-server/distinfo	Mon Jul 22 14:36:43 2019	(r507144)
+++ head/databases/mysqlwsrep56-server/distinfo	Mon Jul 22 15:34:37 2019	(r507145)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1555423195
-SHA256 (codership-mysql-wsrep-wsrep_5.6.43-25.25_GH0.tar.gz) = 12260d27032be278f139ed910d0e0ea8146161fdb59fbfc8e0c825294f567911
-SIZE (codership-mysql-wsrep-wsrep_5.6.43-25.25_GH0.tar.gz) = 32446195
+TIMESTAMP = 1563525011
+SHA256 (codership-mysql-wsrep-wsrep_5.6.44-25.26_GH0.tar.gz) = 4a3671ad6eb2a71585e16f9f9acbec14cbf27eead41cf0dc9c2c8bac448120fe
+SIZE (codership-mysql-wsrep-wsrep_5.6.44-25.26_GH0.tar.gz) = 32778456
 SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
 SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032

Modified: head/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt
==============================================================================
--- head/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt	Mon Jul 22 14:36:43 2019	(r507144)
+++ head/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt	Mon Jul 22 15:34:37 2019	(r507145)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2017-01-25 07:58:07 UTC
+--- CMakeLists.txt.orig	2019-07-16 14:08:43 UTC
 +++ CMakeLists.txt
-@@ -499,12 +499,10 @@ IF(UNIX)
+@@ -532,12 +532,10 @@ IF(UNIX)
  ENDIF()
  
  IF(NOT WITHOUT_SERVER)
@@ -13,7 +13,7 @@
    ENDIF(WITH_EMBEDDED_SERVER)
  ENDIF()
  
-@@ -513,10 +511,7 @@ ENDIF()
+@@ -546,10 +544,7 @@ ENDIF()
  ADD_SUBDIRECTORY(scripts)
  
  IF(NOT WITHOUT_SERVER)
@@ -24,7 +24,7 @@
    IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
      ADD_SUBDIRECTORY(internal)
    ENDIF()
-@@ -574,6 +569,7 @@ ENDIF()
+@@ -608,6 +603,7 @@ ENDIF()
  #
  # RPM installs documentation directly from the source tree
  #
@@ -32,11 +32,11 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -597,6 +593,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+@@ -630,6 +626,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+     PATTERN "mysql.info" EXCLUDE
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
- ENDIF()
 +ENDIF()
+ ENDIF()
  
  INCLUDE(CPack)
- 

Modified: head/databases/mysqlwsrep56-server/files/patch-PR225888.diff
==============================================================================
--- head/databases/mysqlwsrep56-server/files/patch-PR225888.diff	Mon Jul 22 14:36:43 2019	(r507144)
+++ head/databases/mysqlwsrep56-server/files/patch-PR225888.diff	Mon Jul 22 15:34:37 2019	(r507145)
@@ -1,6 +1,4 @@
-diff --git extra/yassl/include/openssl/ssl.h extra/yassl/include/openssl/ssl.h
-index 10fa4913b7e..ff6cb696661 100644
---- extra/yassl/include/openssl/ssl.h.orig
+--- extra/yassl/include/openssl/ssl.h.orig	2019-07-16 14:08:43 UTC
 +++ extra/yassl/include/openssl/ssl.h
 @@ -1,5 +1,5 @@
  /*
@@ -18,9 +16,7 @@ index 10fa4913b7e..ff6cb696661 100644
  unsigned long ERR_get_error(void);
  unsigned long ERR_peek_error(void);
  int           ERR_GET_REASON(int);
-diff --git extra/yassl/src/ssl.cpp extra/yassl/src/ssl.cpp
-index 39244a01b92..c992d446487 100644
---- extra/yassl/src/ssl.cpp.orig
+--- extra/yassl/src/ssl.cpp.orig	2019-07-16 14:08:43 UTC
 +++ extra/yassl/src/ssl.cpp
 @@ -1,5 +1,5 @@
  /*
@@ -29,7 +25,7 @@ index 39244a01b92..c992d446487 100644
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-@@ -1615,7 +1615,7 @@ int SSLeay_add_ssl_algorithms()  // compatibility only
+@@ -1516,7 +1516,7 @@ int SSLeay_add_ssl_algorithms()  // compatibility only
  }
  
  
@@ -38,17 +34,15 @@ index 39244a01b92..c992d446487 100644
  {
      GetErrors().Remove();
  }
-diff --git mysys_ssl/my_aes_openssl.cc mysys_ssl/my_aes_openssl.cc
-index 261ba8ab732..a0f8c147c7a 100644
---- mysys_ssl/my_aes_openssl.cc.orig
+--- mysys_ssl/my_aes_openssl.cc.orig	2019-07-16 14:08:43 UTC
 +++ mysys_ssl/my_aes_openssl.cc
 @@ -1,4 +1,4 @@
--/* Copyright (c) 2015, 2014 Oracle and/or its affiliates. All rights reserved.
+-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
 +/* Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
  
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
-@@ -122,33 +122,46 @@ int my_aes_encrypt(const unsigned char *source, uint32 source_length,
+@@ -108,33 +108,46 @@ int my_aes_encrypt(const unsigned char *source, uint32
                     const unsigned char *key, uint32 key_length,
                     enum my_aes_opmode mode, const unsigned char *iv)
  {
@@ -103,7 +97,7 @@ index 261ba8ab732..a0f8c147c7a 100644
    return MY_AES_BAD_DATA;
  }
  
-@@ -159,7 +172,12 @@ int my_aes_decrypt(const unsigned char *source, uint32 source_length,
+@@ -145,7 +158,12 @@ int my_aes_decrypt(const unsigned char *source, uint32
                     enum my_aes_opmode mode, const unsigned char *iv)
  {
  
@@ -117,7 +111,7 @@ index 261ba8ab732..a0f8c147c7a 100644
    const EVP_CIPHER *cipher= aes_evp_type(mode);
    int u_len, f_len;
  
-@@ -167,27 +185,34 @@ int my_aes_decrypt(const unsigned char *source, uint32 source_length,
+@@ -153,27 +171,34 @@ int my_aes_decrypt(const unsigned char *source, uint32
    unsigned char rkey[MAX_AES_KEY_LENGTH / 8];
  
    my_aes_create_key(key, key_length, rkey, mode);
@@ -161,11 +155,9 @@ index 261ba8ab732..a0f8c147c7a 100644
    return MY_AES_BAD_DATA;
  }
  
-diff --git sql-common/client.c sql-common/client.c
-index 19faefe8323..f1192306ccb 100644
---- sql-common/client.c.orig
+--- sql-common/client.c.orig	2019-07-16 14:08:43 UTC
 +++ sql-common/client.c
-@@ -2744,7 +2744,11 @@ static int ssl_verify_server_cert(Vio *vio, const char* server_hostname, const c
+@@ -1968,7 +1968,11 @@ static int ssl_verify_server_cert(Vio *vio, const char
      goto error;
    }
  
@@ -177,11 +169,9 @@ index 19faefe8323..f1192306ccb 100644
  
    // There should not be any NULL embedded in the CN
    if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn))
-diff --git sql/mysqld.cc sql/mysqld.cc
-index 4acff4e4d9b..307778771be 100644
---- sql/mysqld.cc.orig
+--- sql/mysqld.cc.orig	2019-07-16 14:08:43 UTC
 +++ sql/mysqld.cc
-@@ -3408,7 +3408,11 @@ static int init_ssl()
+@@ -4511,7 +4511,11 @@ static int init_ssl()
  {
  #ifdef HAVE_OPENSSL
  #ifndef HAVE_YASSL
@@ -193,9 +183,9 @@ index 4acff4e4d9b..307778771be 100644
  #endif
    ssl_start();
  #ifndef EMBEDDED_LIBRARY
-@@ -3434,7 +3438,9 @@ static int init_ssl()
+@@ -4525,7 +4529,9 @@ static int init_ssl()
  					  opt_ssl_cipher, &error,
-                                           opt_ssl_crl, opt_ssl_crlpath, ssl_ctx_flags);
+                                           opt_ssl_crl, opt_ssl_crlpath);
      DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd));
 -    ERR_remove_state(0);
 +#if OPENSSL_VERSION_NUMBER < 0x10100000L
@@ -203,12 +193,10 @@ index 4acff4e4d9b..307778771be 100644
 +#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
      if (!ssl_acceptor_fd)
      {
-       /*
-diff --git sql/rpl_slave.cc sql/rpl_slave.cc
-index aee13e12cb2..37a20870bd4 100644
---- sql/rpl_slave.cc.orig
+       sql_print_warning("Failed to setup SSL");
+--- sql/rpl_slave.cc.orig	2019-07-16 14:08:43 UTC
 +++ sql/rpl_slave.cc
-@@ -6026,7 +6026,9 @@ ignore_log_space_limit=%d",
+@@ -5258,7 +5258,9 @@ err:
    mysql_mutex_unlock(&mi->run_lock);
    DBUG_LEAVE;                                   // Must match DBUG_ENTER()
    my_thread_end();
@@ -219,7 +207,7 @@ index aee13e12cb2..37a20870bd4 100644
    pthread_exit(0);
    return(0);                                    // Avoid compiler warnings
  }
-@@ -6256,7 +6258,9 @@ extern "C" void *handle_slave_worker(void *arg)
+@@ -5449,7 +5451,9 @@ err:
    }
  
    my_thread_end();
@@ -230,7 +218,7 @@ index aee13e12cb2..37a20870bd4 100644
    pthread_exit(0);
    DBUG_RETURN(0); 
  }
-@@ -7597,7 +7601,9 @@ llstr(rli->get_group_master_log_pos(), llbuff));
+@@ -6663,7 +6667,9 @@ log '%s' at position %s, relay log '%s' position: %s",
  
    DBUG_LEAVE;                            // Must match DBUG_ENTER()
    my_thread_end();
@@ -241,17 +229,15 @@ index aee13e12cb2..37a20870bd4 100644
    pthread_exit(0);
    return 0;                             // Avoid compiler warnings
  }
-diff --git vio/viossl.c vio/viossl.c
-index 5622cb7ee92..f738570f832 100644
---- vio/viossl.c.orig
+--- vio/viossl.c.orig	2019-07-16 14:08:43 UTC
 +++ vio/viossl.c
 @@ -1,4 +1,4 @@
--/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+-/* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
 +/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-@@ -419,7 +421,11 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
+@@ -415,7 +415,11 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio,
        for (j = 0; j < n; j++)
        {
          SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
@@ -263,17 +249,15 @@ index 5622cb7ee92..f738570f832 100644
        }
    }
  #endif
-diff --git vio/viosslfactories.c vio/viosslfactories.c
-index f50678a37b3..d3891fd8b12 100644
---- vio/viosslfactories.c.orig
+--- vio/viosslfactories.c.orig	2019-07-16 14:08:43 UTC
 +++ vio/viosslfactories.c
 @@ -1,4 +1,4 @@
--/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
 +/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-@@ -121,13 +121,21 @@ static DH *get_dh2048(void)
+@@ -68,13 +68,21 @@ static DH *get_dh2048(void)
    DH *dh;
    if ((dh=DH_new()))
    {

Modified: head/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt
==============================================================================
--- head/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt	Mon Jul 22 14:36:43 2019	(r507144)
+++ head/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt	Mon Jul 22 15:34:37 2019	(r507145)
@@ -1,6 +1,6 @@
---- client/CMakeLists.txt.orig	2018-01-31 14:03:53.000000000 +0100
-+++ client/CMakeLists.txt	2018-02-07 11:27:46.846686000 +0100
-@@ -31,17 +31,20 @@
+--- client/CMakeLists.txt.orig	2019-07-16 14:08:43 UTC
++++ client/CMakeLists.txt
+@@ -30,17 +30,20 @@ INCLUDE_DIRECTORIES(
  COPY_OPENSSL_DLLS(copy_openssl_client)
  
  ADD_DEFINITIONS(${SSL_DEFINES})
@@ -21,7 +21,7 @@
  MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
  TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
  
-@@ -51,17 +54,21 @@
+@@ -50,17 +53,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlclient)
  MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
  SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
  TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
@@ -43,7 +43,7 @@
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
  TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
  
-@@ -74,6 +81,7 @@
+@@ -73,6 +80,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
  
  MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
  TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
@@ -51,7 +51,7 @@
  
  # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
  IF(WIN32)
-@@ -83,11 +91,6 @@
+@@ -82,11 +90,6 @@ ENDIF(WIN32)
  SET_TARGET_PROPERTIES (
    mysql_plugin 
    mysql_upgrade

Modified: head/databases/mysqlwsrep56-server/files/patch-cmake_plugin.cmake
==============================================================================
--- head/databases/mysqlwsrep56-server/files/patch-cmake_plugin.cmake	Mon Jul 22 14:36:43 2019	(r507144)
+++ head/databases/mysqlwsrep56-server/files/patch-cmake_plugin.cmake	Mon Jul 22 15:34:37 2019	(r507145)
@@ -1,10 +1,12 @@
---- cmake/plugin.cmake.orig	2017-01-25 07:58:07 UTC
+--- cmake/plugin.cmake.orig	2019-07-16 14:08:43 UTC
 +++ cmake/plugin.cmake
-@@ -205,7 +205,6 @@ MACRO(MYSQL_ADD_PLUGIN)
-       OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}")  
-     # Install dynamic library
-     MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT Server)
--    INSTALL_DEBUG_TARGET(${target} DESTINATION ${INSTALL_PLUGINDIR}/debug)
-     # 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"
+@@ -216,9 +216,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"

Modified: head/databases/mysqlwsrep56-server/files/patch-extra_CMakeLists.txt
==============================================================================
--- head/databases/mysqlwsrep56-server/files/patch-extra_CMakeLists.txt	Mon Jul 22 14:36:43 2019	(r507144)
+++ head/databases/mysqlwsrep56-server/files/patch-extra_CMakeLists.txt	Mon Jul 22 15:34:37 2019	(r507145)
@@ -1,4 +1,4 @@
---- extra/CMakeLists.txt.orig	2017-01-25 07:58:07 UTC
+--- extra/CMakeLists.txt.orig	2019-07-16 14:08:43 UTC
 +++ extra/CMakeLists.txt
 @@ -101,8 +101,10 @@ IF(UNIX)
    MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
@@ -8,6 +8,6 @@
    MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
    TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl)
    SET_TARGET_PROPERTIES(mysql_waitpid PROPERTIES LINKER_LANGUAGE CXX)
- ENDIF()
 +ENDIF()
+ ENDIF()
  

Modified: head/databases/mysqlwsrep56-server/files/patch-include_my__compare.h
==============================================================================
--- head/databases/mysqlwsrep56-server/files/patch-include_my__compare.h	Mon Jul 22 14:36:43 2019	(r507144)
+++ head/databases/mysqlwsrep56-server/files/patch-include_my__compare.h	Mon Jul 22 15:34:37 2019	(r507145)
@@ -1,6 +1,6 @@
---- include/my_compare.h.orig	2011-05-10 09:46:46.000000000 +0200
-+++ include/my_compare.h	2011-05-10 09:47:01.000000000 +0200
-@@ -39,7 +39,7 @@
+--- include/my_compare.h.orig	2019-07-16 14:08:43 UTC
++++ include/my_compare.h
+@@ -39,7 +39,7 @@ extern "C" {
    But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
  */
  

Modified: head/databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc
==============================================================================
--- head/databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc	Mon Jul 22 14:36:43 2019	(r507144)
+++ head/databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc	Mon Jul 22 15:34:37 2019	(r507145)
@@ -1,7 +1,7 @@
---- mysys_ssl/my_default.cc.orig	2016-11-28 13:36:22 UTC
+--- mysys_ssl/my_default.cc.orig	2019-07-16 14:08:43 UTC
 +++ mysys_ssl/my_default.cc
-@@ -110,7 +110,7 @@ static my_bool defaults_already_read= FA
- 
+@@ -116,7 +116,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;
  
-@@ -903,6 +903,14 @@ static int search_default_file_with_ext(
-       return 1;                                 /* Ignore wrong files */
-   }
+@@ -921,6 +921,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++;
-@@ -1241,7 +1249,8 @@ void my_print_default_files(const char *
+@@ -1259,7 +1267,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 @@
          }
        }
      }
-@@ -1400,13 +1409,8 @@ static const char **init_default_directo
+@@ -1418,14 +1427,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
  
-@@ -1477,7 +1481,7 @@ int check_file_permissions(const char *f
+   if ((env= getenv("MYSQL_HOME")))
+@@ -1495,7 +1499,7 @@ int check_file_permissions(const char *file_name, my_b
    MY_STAT stat_info;
  
    if (!my_stat(file_name,&stat_info,MYF(0)))

Modified: head/databases/mysqlwsrep56-server/files/patch-plugin_password__validation_validate__password.cc
==============================================================================
--- head/databases/mysqlwsrep56-server/files/patch-plugin_password__validation_validate__password.cc	Mon Jul 22 14:36:43 2019	(r507144)
+++ head/databases/mysqlwsrep56-server/files/patch-plugin_password__validation_validate__password.cc	Mon Jul 22 15:34:37 2019	(r507145)
@@ -1,5 +1,5 @@
---- plugin/password_validation/validate_password.cc.orig	2013-09-10 07:38:25.000000000 +0000
-+++ plugin/password_validation/validate_password.cc	2013-10-05 15:40:20.790380179 +0000
+--- plugin/password_validation/validate_password.cc.orig	2019-07-16 14:08:43 UTC
++++ plugin/password_validation/validate_password.cc
 @@ -16,6 +16,8 @@
  #include <my_sys.h>
  #include <string>
@@ -7,5 +7,5 @@
 +/* solve clash between libc++ bitset::test() and test macro from my_global.h */
 +#undef test
  #include <set>
+ #include <ios>       // std::streamoff
  #include <iostream>
- #include <fstream>

Modified: head/databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt
==============================================================================
--- head/databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt	Mon Jul 22 14:36:43 2019	(r507144)
+++ head/databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt	Mon Jul 22 15:34:37 2019	(r507145)
@@ -1,6 +1,6 @@
---- scripts/CMakeLists.txt.orig	2017-01-25 07:58:07 UTC
+--- scripts/CMakeLists.txt.orig	2019-07-16 14:08:43 UTC
 +++ scripts/CMakeLists.txt
-@@ -298,6 +298,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
+@@ -304,6 +304,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()
-@@ -360,15 +362,10 @@ ELSE()
+@@ -366,15 +368,10 @@ ELSE()
    # On Unix, most of the files end up in the bin directory
    SET(mysql_config_COMPONENT COMPONENT Development)
    SET(BIN_SCRIPTS
@@ -25,7 +25,7 @@
      mysqlhotcopy
      mysqldumpslow
      mysqld_multi
-@@ -378,7 +375,7 @@ ELSE()
+@@ -384,7 +381,7 @@ ELSE()
    FOREACH(file ${BIN_SCRIPTS})
      IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
        CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh

Modified: head/databases/mysqlwsrep56-server/files/patch-scripts_mysqld__safe.sh
==============================================================================
--- head/databases/mysqlwsrep56-server/files/patch-scripts_mysqld__safe.sh	Mon Jul 22 14:36:43 2019	(r507144)
+++ head/databases/mysqlwsrep56-server/files/patch-scripts_mysqld__safe.sh	Mon Jul 22 15:34:37 2019	(r507145)
@@ -1,6 +1,6 @@
---- scripts/mysqld_safe.sh.orig	2007-10-08 10:39:23.000000000 +0200
-+++ scripts/mysqld_safe.sh	2007-10-08 10:40:52.000000000 +0200
-@@ -242,10 +242,10 @@
+--- scripts/mysqld_safe.sh.orig	2019-07-19 08:39:37 UTC
++++ scripts/mysqld_safe.sh
+@@ -568,10 +568,10 @@ fi
  
  if test -z "$MYSQL_HOME"
  then 
@@ -13,7 +13,7 @@
  $DATADIR/my.cnf
  IGNORING $DATADIR/my.cnf"
  
-@@ -254,7 +254,7 @@
+@@ -580,7 +580,7 @@ IGNORING $DATADIR/my.cnf"
    then
      log_error "WARNING: Found $DATADIR/my.cnf
  The data directory is a deprecated location for my.cnf, please move it to

Modified: head/databases/mysqlwsrep56-server/files/patch-sql_CMakeLists.txt
==============================================================================
--- head/databases/mysqlwsrep56-server/files/patch-sql_CMakeLists.txt	Mon Jul 22 14:36:43 2019	(r507144)
+++ head/databases/mysqlwsrep56-server/files/patch-sql_CMakeLists.txt	Mon Jul 22 15:34:37 2019	(r507145)
@@ -1,18 +1,35 @@
---- sql/CMakeLists.txt.orig	2017-01-25 07:58:07 UTC
+--- sql/CMakeLists.txt.orig	2019-07-16 14:08:43 UTC
 +++ sql/CMakeLists.txt
-@@ -472,6 +472,7 @@ ADD_CUSTOM_TARGET(distclean
+@@ -435,7 +435,7 @@ ADD_CUSTOM_TARGET( 
+         DEPENDS ${GEN_DIGEST_SOURCES}
+ )
  
+-
++IF(FALSE)
+ MYSQL_ADD_PLUGIN(udf_example udf_example.cc
+                  MODULE_ONLY TEST_ONLY MODULE_OUTPUT_NAME "udf_example")
+ IF(NOT DISABLE_SHARED)
+@@ -445,6 +445,7 @@ IF(NOT DISABLE_SHARED)
+       "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def")
+   ENDIF()
+ ENDIF()
++ENDIF()
+ 
+ FOREACH(tool gtar tar git)
+   STRING(TOUPPER ${tool}  TOOL)
+@@ -470,6 +471,7 @@ ADD_CUSTOM_TARGET(distclean
+ 
  IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
  
 +IF(FALSE)
  # Copy db.opt into data/test/
  SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) 
  INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles)
-@@ -516,6 +517,7 @@ ELSE()
+@@ -512,6 +514,7 @@ IF(WIN32 AND MYSQLD_EXECUTABLE)
+ ELSE()
+   # Not windows or cross compiling, just install an empty directory
    INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
++ENDIF()
  ENDIF()
  ENDIF()
-+ENDIF()
  
- ADD_CUSTOM_TARGET(show-dist-name
-   COMMAND ${CMAKE_COMMAND} -E echo "${CPACK_PACKAGE_FILE_NAME}"

Modified: head/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc
==============================================================================
--- head/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc	Mon Jul 22 14:36:43 2019	(r507144)
+++ head/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc	Mon Jul 22 15:34:37 2019	(r507145)
@@ -1,6 +1,6 @@
---- sql/sys_vars.cc.orig	2012-06-15 17:03:32.000000000 +0200
-+++ sql/sys_vars.cc	2012-06-15 17:16:23.000000000 +0200
-@@ -900,7 +900,7 @@
+--- sql/sys_vars.cc.orig	2019-07-16 14:08:43 UTC
++++ sql/sys_vars.cc
+@@ -1415,7 +1415,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",
-@@ -1401,7 +1401,7 @@
+@@ -2034,7 +2034,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));
  
-@@ -1416,7 +1416,7 @@
+@@ -2049,7 +2049,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));
  
-@@ -2257,7 +2257,7 @@
+@@ -3182,7 +3182,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),
@@ -35,4 +35,4 @@
 +       VALID_RANGE(1, INT_MAX32/1000),
         DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
  
- /** propagates changes to the relevant flag of @@optimizer_switch */
+ static Sys_var_plugin Sys_default_storage_engine(

Modified: head/databases/mysqlwsrep56-server/files/patch-support-files_CMakeLists.txt
==============================================================================
--- head/databases/mysqlwsrep56-server/files/patch-support-files_CMakeLists.txt	Mon Jul 22 14:36:43 2019	(r507144)
+++ head/databases/mysqlwsrep56-server/files/patch-support-files_CMakeLists.txt	Mon Jul 22 15:34:37 2019	(r507145)
@@ -1,6 +1,6 @@
---- support-files/CMakeLists.txt.orig	2017-01-25 07:58:07 UTC
+--- support-files/CMakeLists.txt.orig	2019-07-16 14:08:43 UTC
 +++ support-files/CMakeLists.txt
-@@ -69,7 +69,9 @@ IF(UNIX)
+@@ -74,7 +74,9 @@ IF(UNIX)
      INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
    ENDIF()
  



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907221534.x6MFYc7a049245>