databases/mysqlwsrep56-server: upgrade 5.6.45-25.27 -> 5.6.46-25.28

PR:		241533
Submitted by:	Teemu Ollakka <teemu.ollakka@galeracluster.com>
Relnotes:	http://releases.galeracluster.com/mysql-wsrep-5.6.46-25.28/release-notes-mysql-wsrep-5.6.46-25.28.txt

databases/mysqlwsrep56-server/Makefile

@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	mysqlwsrep
-PORTVERSION?=	5.6.45
+PORTVERSION?=	5.6.46
 DISTVERSIONPREFIX?=	wsrep_
-DISTVERSIONSUFFIX?=	-25.27
+DISTVERSIONSUFFIX?=	-25.28
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	databases
 PKGNAMESUFFIX=	56-server
 
@@ -80,6 +80,7 @@ CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
 		-DOPENSSL_LIBRARY=${OPENSSLLIB}/libssl.so \
 		-DINSTALL_MYSQLTESTDIR=0 \
 		-DWITH_LIBWRAP=1 \
+		-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
 		-DWITH_WSREP=1
 
 SHEBANG_FILES=	scripts/*.pl* scripts/*.sh scripts/wsrep_sst_*

databases/mysqlwsrep56-server/distinfo

@@ -1,5 +1,5 @@
-TIMESTAMP = 1567524448
+TIMESTAMP = 1571904979
-SHA256 (codership-mysql-wsrep-wsrep_5.6.45-25.27_GH0.tar.gz) = 670c622644a9a271db810b193eb7eea3693b5ec6e25c38a26e22cd1f4e551d73
+SHA256 (codership-mysql-wsrep-wsrep_5.6.46-25.28_GH0.tar.gz) = b15b3ffdc357fec52f2a03be30164879ae69739755c8f61a7c99e6bc7046f02f
-SIZE (codership-mysql-wsrep-wsrep_5.6.45-25.27_GH0.tar.gz) = 32782117
+SIZE (codership-mysql-wsrep-wsrep_5.6.46-25.28_GH0.tar.gz) = 32659765
 SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
 SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032

databases/mysqlwsrep56-server/files/patch-CMakeLists.txt

@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2019-07-16 14:08:43 UTC
+--- CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
 +++ CMakeLists.txt
-@@ -532,12 +532,10 @@ IF(UNIX)
+@@ -568,12 +568,10 @@ IF(UNIX)
  ENDIF()
  
  IF(NOT WITHOUT_SERVER)
@@ -13,7 +13,7 @@
    ENDIF(WITH_EMBEDDED_SERVER)
  ENDIF()
  
-@@ -546,10 +544,7 @@ ENDIF()
+@@ -582,10 +580,7 @@ ENDIF()
  ADD_SUBDIRECTORY(scripts)
  
  IF(NOT WITHOUT_SERVER)
@@ -24,15 +24,15 @@
    IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
      ADD_SUBDIRECTORY(internal)
    ENDIF()
-@@ -608,6 +603,7 @@ ENDIF()
+@@ -644,6 +639,7 @@ ENDIF()
  #
  # RPM installs documentation directly from the source tree
  #
 +IF(FALSE)
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-   INSTALL(FILES COPYING LICENSE.mysql 
+   INSTALL(FILES
-   DESTINATION ${INSTALL_DOCREADMEDIR} 
+     README
-@@ -630,6 +626,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+@@ -664,6 +660,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
      PATTERN "mysql.info" EXCLUDE
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )

databases/mysqlwsrep56-server/files/patch-PR225888.diff

@@ -1,286 +0,0 @@
---- extra/yassl/include/openssl/ssl.h.orig	2019-07-16 14:08:43 UTC
-+++ extra/yassl/include/openssl/ssl.h
-@@ -1,5 +1,5 @@
- /*
--   Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
-+   Copyright (c) 2005, 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
-@@ -179,7 +179,7 @@ enum { /* X509 Constants */
- unsigned long ERR_get_error_line_data(const char**, int*, const char**, int *);
- void          ERR_print_errors_fp(FILE*);
- char*         ERR_error_string(unsigned long,char*);
--void          ERR_remove_state(unsigned long);
-+void          ERR_remove_thread_state(const void *);
- unsigned long ERR_get_error(void);
- unsigned long ERR_peek_error(void);
- int           ERR_GET_REASON(int);
---- extra/yassl/src/ssl.cpp.orig	2019-07-16 14:08:43 UTC
-+++ extra/yassl/src/ssl.cpp
-@@ -1,5 +1,5 @@
- /*
--   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
-+   Copyright (c) 2005, 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
-@@ -1516,7 +1516,7 @@ int SSLeay_add_ssl_algorithms()  // compatibility only
- }
- 
- 
--void ERR_remove_state(unsigned long)
-+void ERR_remove_thread_state(const void *)
- {
-     GetErrors().Remove();
- }
---- 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) 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
-@@ -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)
- {
--  EVP_CIPHER_CTX ctx;
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  EVP_CIPHER_CTX stack_ctx;
-+  EVP_CIPHER_CTX *ctx= &stack_ctx;
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+  EVP_CIPHER_CTX *ctx= EVP_CIPHER_CTX_new();
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   const EVP_CIPHER *cipher= aes_evp_type(mode);
-   int u_len, f_len;
-   /* The real key to be used for encryption */
-   unsigned char rkey[MAX_AES_KEY_LENGTH / 8];
-   my_aes_create_key(key, key_length, rkey, mode);
- 
--  if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
-+  if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
-     return MY_AES_BAD_DATA;
- 
--  if (!EVP_EncryptInit(&ctx, cipher, rkey, iv))
-+  if (!EVP_EncryptInit(ctx, cipher, rkey, iv))
-     goto aes_error;                             /* Error */
--  if (!EVP_CIPHER_CTX_set_padding(&ctx, 1))
-+  if (!EVP_CIPHER_CTX_set_padding(ctx, 1))
-     goto aes_error;                             /* Error */
--  if (!EVP_EncryptUpdate(&ctx, dest, &u_len, source, source_length))
-+  if (!EVP_EncryptUpdate(ctx, dest, &u_len, source, source_length))
-     goto aes_error;                             /* Error */
- 
--  if (!EVP_EncryptFinal(&ctx, dest + u_len, &f_len))
-+  if (!EVP_EncryptFinal(ctx, dest + u_len, &f_len))
-     goto aes_error;                             /* Error */
- 
--  EVP_CIPHER_CTX_cleanup(&ctx);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  EVP_CIPHER_CTX_cleanup(ctx);
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+  EVP_CIPHER_CTX_free(ctx);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   return u_len + f_len;
- 
- aes_error:
-   /* need to explicitly clean up the error if we want to ignore it */
-   ERR_clear_error();
--  EVP_CIPHER_CTX_cleanup(&ctx);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+    EVP_CIPHER_CTX_cleanup(ctx);
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+    EVP_CIPHER_CTX_free(ctx);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   return MY_AES_BAD_DATA;
- }
- 
-@@ -145,7 +158,12 @@ int my_aes_decrypt(const unsigned char *source, uint32
-                    enum my_aes_opmode mode, const unsigned char *iv)
- {
- 
--  EVP_CIPHER_CTX ctx;
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  EVP_CIPHER_CTX stack_ctx;
-+  EVP_CIPHER_CTX *ctx= &stack_ctx;
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+  EVP_CIPHER_CTX *ctx= EVP_CIPHER_CTX_new();
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   const EVP_CIPHER *cipher= aes_evp_type(mode);
-   int u_len, f_len;
- 
-@@ -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);
--  if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
-+  if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
-     return MY_AES_BAD_DATA;
- 
--  EVP_CIPHER_CTX_init(&ctx);
--
--  if (!EVP_DecryptInit(&ctx, aes_evp_type(mode), rkey, iv))
-+  if (!EVP_DecryptInit(ctx, aes_evp_type(mode), rkey, iv))
-     goto aes_error;                             /* Error */
--  if (!EVP_CIPHER_CTX_set_padding(&ctx, 1))
-+  if (!EVP_CIPHER_CTX_set_padding(ctx, 1))
-     goto aes_error;                             /* Error */
--  if (!EVP_DecryptUpdate(&ctx, dest, &u_len, source, source_length))
-+  if (!EVP_DecryptUpdate(ctx, dest, &u_len, source, source_length))
-     goto aes_error;                             /* Error */
--  if (!EVP_DecryptFinal_ex(&ctx, dest + u_len, &f_len))
-+  if (!EVP_DecryptFinal_ex(ctx, dest + u_len, &f_len))
-     goto aes_error;                             /* Error */
- 
--  EVP_CIPHER_CTX_cleanup(&ctx);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  EVP_CIPHER_CTX_cleanup(ctx);
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+  EVP_CIPHER_CTX_free(ctx);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+
-   return u_len + f_len;
- 
- aes_error:
-   /* need to explicitly clean up the error if we want to ignore it */
-   ERR_clear_error();
--  EVP_CIPHER_CTX_cleanup(&ctx);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  EVP_CIPHER_CTX_cleanup(ctx);
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+  EVP_CIPHER_CTX_free(ctx);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   return MY_AES_BAD_DATA;
- }
- 
---- sql-common/client.c.orig	2019-07-16 14:08:43 UTC
-+++ sql-common/client.c
-@@ -1968,7 +1968,11 @@ static int ssl_verify_server_cert(Vio *vio, const char
-     goto error;
-   }
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-   cn= (char *) ASN1_STRING_data(cn_asn1);
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+  cn= (char *) ASN1_STRING_get0_data(cn_asn1);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- 
-   // There should not be any NULL embedded in the CN
-   if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn))
---- sql/mysqld.cc.orig	2019-07-16 14:08:43 UTC
-+++ sql/mysqld.cc
-@@ -4511,7 +4511,11 @@ static int init_ssl()
- {
- #ifdef HAVE_OPENSSL
- #ifndef HAVE_YASSL
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   CRYPTO_malloc_init();
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+  OPENSSL_malloc_init();
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- #endif
-   ssl_start();
- #ifndef EMBEDDED_LIBRARY
-@@ -4525,7 +4529,9 @@ static int init_ssl()
- 					  opt_ssl_cipher, &error,
-                                           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
-+    ERR_remove_thread_state(0);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-     if (!ssl_acceptor_fd)
-     {
-       sql_print_warning("Failed to setup SSL");
---- sql/rpl_slave.cc.orig	2019-07-16 14:08:43 UTC
-+++ sql/rpl_slave.cc
-@@ -5258,7 +5258,9 @@ err:
-   mysql_mutex_unlock(&mi->run_lock);
-   DBUG_LEAVE;                                   // Must match DBUG_ENTER()
-   my_thread_end();
--  ERR_remove_state(0);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  ERR_remove_thread_state(0);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   pthread_exit(0);
-   return(0);                                    // Avoid compiler warnings
- }
-@@ -5449,7 +5451,9 @@ err:
-   }
- 
-   my_thread_end();
--  ERR_remove_state(0);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  ERR_remove_thread_state(0);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   pthread_exit(0);
-   DBUG_RETURN(0); 
- }
-@@ -6663,7 +6667,9 @@ log '%s' at position %s, relay log '%s' position: %s",
- 
-   DBUG_LEAVE;                            // Must match DBUG_ENTER()
-   my_thread_end();
--  ERR_remove_state(0);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  ERR_remove_thread_state(0);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   pthread_exit(0);
-   return 0;                             // Avoid compiler warnings
- }
---- vio/viossl.c.orig	2019-07-16 14:08:43 UTC
-+++ vio/viossl.c
-@@ -1,4 +1,4 @@
--/* 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
-@@ -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);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-         DBUG_PRINT("info", ("  %d: %s\n", c->id, c->name));
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+        DBUG_PRINT("info", ("  %d: %s\n", SSL_COMP_get_id(c), SSL_COMP_get0_name(c)));
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-       }
-   }
- #endif
---- vio/viosslfactories.c.orig	2019-07-16 14:08:43 UTC
-+++ vio/viosslfactories.c
-@@ -1,4 +1,4 @@
--/* 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
-@@ -68,13 +68,21 @@ static DH *get_dh2048(void)
-   DH *dh;
-   if ((dh=DH_new()))
-   {
--    dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
--    dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
--    if (! dh->p || ! dh->g)
--    {
-+    BIGNUM *p= BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
-+    BIGNUM *g= BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
-+    if (!p || !g
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+        || !DH_set0_pqg(dh, p, NULL, g)
-+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
-+    ) {
-+      /* DH_free() will free 'p' and 'g' at once. */
-       DH_free(dh);
--      dh=0;
-+      return NULL;
-     }
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+    dh->p= p;
-+    dh->g= g;
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   }
-   return(dh);
- }

databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt

@@ -1,7 +1,7 @@
---- client/CMakeLists.txt.orig	2019-07-16 14:08:43 UTC
+--- client/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
 +++ client/CMakeLists.txt
-@@ -30,17 +30,20 @@ INCLUDE_DIRECTORIES(
+@@ -34,17 +34,20 @@ INCLUDE_DIRECTORIES(
- COPY_OPENSSL_DLLS(copy_openssl_client)
+ 
  
  ADD_DEFINITIONS(${SSL_DEFINES})
 +IF(FALSE)
@@ -21,7 +21,7 @@
  MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
  TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
  
-@@ -50,17 +53,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlclient)
+@@ -54,17 +57,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)
  
-@@ -73,6 +80,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
+@@ -77,6 +84,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)
-@@ -82,11 +90,6 @@ ENDIF(WIN32)
+@@ -86,11 +94,6 @@ ENDIF(WIN32)
  SET_TARGET_PROPERTIES (
    mysql_plugin 
    mysql_upgrade

databases/mysqlwsrep56-server/files/patch-cmake_plugin.cmake

@@ -1,6 +1,6 @@
---- cmake/plugin.cmake.orig	2019-07-16 14:08:43 UTC
+--- cmake/plugin.cmake.orig	2019-10-21 05:17:49 UTC
 +++ cmake/plugin.cmake
-@@ -216,9 +216,6 @@ MACRO(MYSQL_ADD_PLUGIN)
+@@ -223,9 +223,6 @@ MACRO(MYSQL_ADD_PLUGIN)
        MYSQL_INSTALL_TARGETS(${target}
          DESTINATION ${INSTALL_PLUGINDIR}
          COMPONENT ${INSTALL_COMPONENT})

databases/mysqlwsrep56-server/files/patch-cmake_ssl.cmake

@@ -1,6 +1,6 @@
---- cmake/ssl.cmake.orig	2017-01-25 07:58:07 UTC
+--- cmake/ssl.cmake.orig	2019-10-21 05:17:49 UTC
 +++ cmake/ssl.cmake
-@@ -176,7 +176,7 @@ MACRO (MYSQL_CHECK_SSL)
+@@ -195,7 +195,7 @@ MACRO (MYSQL_CHECK_SSL)
      IF(OPENSSL_INCLUDE_DIR AND
         OPENSSL_LIBRARY   AND
         CRYPTO_LIBRARY      AND

databases/mysqlwsrep56-server/files/patch-extra_CMakeLists.txt

@@ -1,6 +1,6 @@
---- extra/CMakeLists.txt.orig	2019-07-16 14:08:43 UTC
+--- extra/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
 +++ extra/CMakeLists.txt
-@@ -101,8 +101,10 @@ IF(UNIX)
+@@ -100,8 +100,10 @@ IF(UNIX)
    MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
    TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
  

databases/mysqlwsrep56-server/files/patch-include_CMakeLists.txt

@@ -1,6 +1,6 @@
---- include/CMakeLists.txt.orig	2017-01-25 07:58:07 UTC
+--- include/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
 +++ include/CMakeLists.txt
-@@ -65,10 +65,12 @@ SET(HEADERS 
+@@ -72,10 +72,12 @@ SET(HEADERS 
    ${HEADERS_GEN_CONFIGURE}
  )
  

databases/mysqlwsrep56-server/files/patch-include_my__compare.h

@@ -1,6 +1,6 @@
---- include/my_compare.h.orig	2019-07-16 14:08:43 UTC
+--- include/my_compare.h.orig	2019-10-21 05:17:49 UTC
 +++ include/my_compare.h
-@@ -39,7 +39,7 @@ extern "C" {
+@@ -46,7 +46,7 @@ extern "C" {
    But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
  */
  

databases/mysqlwsrep56-server/files/patch-include_myisam.h

@@ -1,6 +1,6 @@
---- include/myisam.h.orig	2017-01-25 07:58:07 UTC
+--- include/myisam.h.orig	2019-10-21 05:17:49 UTC
 +++ include/myisam.h
-@@ -49,7 +49,7 @@ extern "C" {
+@@ -56,7 +56,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.
  */

databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt

@@ -1,19 +1,19 @@
---- libmysql/CMakeLists.txt.orig	2017-01-25 07:58:07 UTC
+--- libmysql/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
 +++ libmysql/CMakeLists.txt
-@@ -180,7 +180,7 @@ IF(WIN32)
+@@ -205,7 +205,7 @@ IF(WIN32)
  ENDIF()
  
  # Merge several convenience libraries into one big mysqlclient
--MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
+-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development)
-+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
++MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development NOINSTALL)
+ TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK})
  
  # Visual Studio users need debug  static library for debug projects
- IF(MSVC)
+@@ -234,19 +234,22 @@ IF(UNIX)
-@@ -208,19 +208,22 @@ IF(UNIX)
    ENDMACRO()
  ENDIF()
  
-+IF(FALSE)
++IF (FALSE)
  IF(UNIX)
    GET_TARGET_NAME(mysqlclient lib_name)
    INSTALL_SYMLINK(mysqlclient
@@ -25,15 +25,15 @@
  IF(NOT DISABLE_SHARED)
    # Merge several convenience libraries into one big mysqlclient
    # and link them together into shared library.
-   MERGE_LIBRARIES(libmysql SHARED ${LIBS}
+   MERGE_LIBRARIES(libmysql SHARED ${LIBS_TO_MERGE}
      EXPORTS ${CLIENT_API_FUNCTIONS}
 -    COMPONENT SharedLibraries)
 +    COMPONENT SharedLibraries NOINSTALL)
-+ IF(FALSE)
++  IF (FALSE)
+   TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
    IF(UNIX)
      # libtool compatability
-     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
+@@ -316,4 +319,5 @@ IF(NOT DISABLE_SHARED)
-@@ -289,4 +292,5 @@ IF(NOT DISABLE_SHARED)
          ${INSTALL_LIBDIR} SharedLibraries)
      ENDFOREACH()
    ENDIF()

databases/mysqlwsrep56-server/files/patch-libservices_CMakeLists.txt

@@ -1,6 +1,6 @@
---- libservices/CMakeLists.txt.orig	2017-01-25 07:58:07 UTC
+--- libservices/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
 +++ libservices/CMakeLists.txt
-@@ -24,4 +24,6 @@ SET(MYSQLSERVICES_SOURCES
+@@ -31,4 +31,6 @@ SET(MYSQLSERVICES_SOURCES
    mysql_string_service.c)
  
  ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})

databases/mysqlwsrep56-server/files/patch-man_CMakeLists.txt

@@ -1,6 +1,6 @@
---- man/CMakeLists.txt.orig	2017-01-25 07:58:07 UTC
+--- man/CMakeLists.txt.orig	2019-10-21 05:17:49 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

databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc

@@ -1,6 +1,6 @@
---- mysys_ssl/my_default.cc.orig	2019-07-16 14:08:43 UTC
+--- mysys_ssl/my_default.cc.orig	2019-10-21 05:17:49 UTC
 +++ mysys_ssl/my_default.cc
-@@ -116,7 +116,7 @@ char wsrep_defaults_group_suffix[FN_EXTLEN]={0,};
+@@ -128,7 +128,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;
  
-@@ -921,6 +921,14 @@ static int search_default_file_with_ext(Process_option
+@@ -933,6 +933,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++;
-@@ -1259,7 +1267,8 @@ void my_print_default_files(const char *conf_file)
+@@ -1271,7 +1279,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 @@
          }
        }
      }
-@@ -1418,14 +1427,9 @@ static const char **init_default_directories(MEM_ROOT 
+@@ -1430,14 +1439,9 @@ static const char **init_default_directories(MEM_ROOT 
  
  #else
  
@@ -51,7 +51,7 @@
  #endif
  
    if ((env= getenv("MYSQL_HOME")))
-@@ -1495,7 +1499,7 @@ int check_file_permissions(const char *file_name, my_b
+@@ -1507,7 +1511,7 @@ int check_file_permissions(const char *file_name, my_b
    MY_STAT stat_info;
  
    if (!my_stat(file_name,&stat_info,MYF(0)))

databases/mysqlwsrep56-server/files/patch-plugin_password__validation_validate__password.cc

@@ -1,6 +1,6 @@
---- plugin/password_validation/validate_password.cc.orig	2019-07-16 14:08:43 UTC
+--- plugin/password_validation/validate_password.cc.orig	2019-10-21 05:17:49 UTC
 +++ plugin/password_validation/validate_password.cc
-@@ -16,6 +16,8 @@
+@@ -23,6 +23,8 @@
  #include <my_sys.h>
  #include <string>
  #include <mysql/plugin_validate_password.h>

databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt

@@ -1,6 +1,6 @@
---- scripts/CMakeLists.txt.orig	2019-07-16 14:08:43 UTC
+--- scripts/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
 +++ scripts/CMakeLists.txt
-@@ -304,6 +304,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
+@@ -311,6 +311,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()
-@@ -366,15 +368,10 @@ ELSE()
+@@ -373,15 +375,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
-@@ -384,7 +381,7 @@ ELSE()
+@@ -391,7 +388,7 @@ ELSE()
    FOREACH(file ${BIN_SCRIPTS})
      IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
        CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh

databases/mysqlwsrep56-server/files/patch-sql_CMakeLists.txt

@@ -1,6 +1,6 @@
---- sql/CMakeLists.txt.orig	2019-07-16 14:08:43 UTC
+--- sql/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
 +++ sql/CMakeLists.txt
-@@ -435,7 +435,7 @@ ADD_CUSTOM_TARGET( 
+@@ -442,7 +442,7 @@ ADD_CUSTOM_TARGET( 
          DEPENDS ${GEN_DIGEST_SOURCES}
  )
  
@@ -9,7 +9,7 @@
  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)
+@@ -452,6 +452,7 @@ IF(NOT DISABLE_SHARED)
        "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def")
    ENDIF()
  ENDIF()
@@ -17,7 +17,7 @@
  
  FOREACH(tool gtar tar git)
    STRING(TOUPPER ${tool}  TOOL)
-@@ -470,6 +471,7 @@ ADD_CUSTOM_TARGET(distclean
+@@ -477,6 +478,7 @@ ADD_CUSTOM_TARGET(distclean
  
  IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
  
@@ -25,7 +25,7 @@
  # Copy db.opt into data/test/
  SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) 
  INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles)
-@@ -512,6 +514,7 @@ IF(WIN32 AND MYSQLD_EXECUTABLE)
+@@ -519,6 +521,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)

databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc

@@ -1,6 +1,6 @@
---- sql/sys_vars.cc.orig	2019-07-16 14:08:43 UTC
+--- sql/sys_vars.cc.orig	2019-10-21 05:17:49 UTC
 +++ sql/sys_vars.cc
-@@ -1415,7 +1415,7 @@ static Sys_var_ulong Sys_interactive_timeout(
+@@ -1422,7 +1422,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",
-@@ -2034,7 +2034,7 @@ static Sys_var_ulong Sys_net_read_timeout(
+@@ -2041,7 +2041,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));
  
-@@ -2049,7 +2049,7 @@ static Sys_var_ulong Sys_net_write_timeout(
+@@ -2056,7 +2056,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));
  
-@@ -3182,7 +3182,7 @@ static Sys_var_ulong Sys_net_wait_timeout(
+@@ -3189,7 +3189,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),

databases/mysqlwsrep56-server/files/patch-support-files_CMakeLists.txt

@@ -1,6 +1,6 @@
---- support-files/CMakeLists.txt.orig	2019-07-16 14:08:43 UTC
+--- support-files/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
 +++ support-files/CMakeLists.txt
-@@ -74,7 +74,9 @@ IF(UNIX)
+@@ -81,7 +81,9 @@ IF(UNIX)
      INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
    ENDIF()