Attachment #205982 for bug #239373

View | Details | Raw Unified | Return to bug 239373
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	mysqlwsrep
PORTVERSION?=	5.6.44
DISTVERSIONPREFIX?=	wsrep_
DISTVERSIONSUFFIX?=	-25.26
CATEGORIES=	databases ipv6
PKGNAMESUFFIX=	56-server


		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'

DATADIR=	${PREFIX}/share/mysql
ETCDIR=		${PREFIX}/etc/mysql

Lines 1-5 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1555423195	1	TIMESTAMP = 1563525011
2	SHA256 (codership-mysql-wsrep-wsrep_5.6.43-25.25_GH0.tar.gz) = 12260d27032be278f139ed910d0e0ea8146161fdb59fbfc8e0c825294f567911	2	SHA256 (codership-mysql-wsrep-wsrep_5.6.44-25.26_GH0.tar.gz) = 4a3671ad6eb2a71585e16f9f9acbec14cbf27eead41cf0dc9c2c8bac448120fe
3	SIZE (codership-mysql-wsrep-wsrep_5.6.43-25.25_GH0.tar.gz) = 32446195	3	SIZE (codership-mysql-wsrep-wsrep_5.6.44-25.26_GH0.tar.gz) = 32778456
4	SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0	4	SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
5	SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032	5	SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032




--- CMakeLists.txt.orig	2019-07-16 14:08:43 UTC
+++ CMakeLists.txt
@@ -532,12 +532,10 @@ IF(UNIX)
 ENDIF()
 
 IF(NOT WITHOUT_SERVER)

   ENDIF(WITH_EMBEDDED_SERVER)
 ENDIF()
 
@@ -546,10 +544,7 @@ ENDIF()
 ADD_SUBDIRECTORY(scripts)
 
 IF(NOT WITHOUT_SERVER)

   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
     ADD_SUBDIRECTORY(internal)
   ENDIF()
@@ -608,6 +603,7 @@ ENDIF()
 #
 # RPM installs documentation directly from the source tree
 #

 IF(NOT INSTALL_LAYOUT MATCHES "RPM")
   INSTALL(FILES COPYING LICENSE.mysql 
   DESTINATION ${INSTALL_DOCREADMEDIR} 
@@ -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)
 




--- extra/yassl/include/openssl/ssl.h.orig	2019-07-16 14:08:43 UTC
index 10fa4913b7e..ff6cb696661 100644
--- extra/yassl/include/openssl/ssl.h.orig
+++ extra/yassl/include/openssl/ssl.h
@@ -1,5 +1,5 @@
 /*

 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
index 39244a01b92..c992d446487 100644
--- extra/yassl/src/ssl.cpp.orig
+++ extra/yassl/src/ssl.cpp
@@ -1,5 +1,5 @@
 /*

 
    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
 }
 
 

 {
     GetErrors().Remove();
 }
--- mysys_ssl/my_aes_openssl.cc.orig	2019-07-16 14:08:43 UTC
index 261ba8ab732..a0f8c147c7a 100644
--- mysys_ssl/my_aes_openssl.cc.orig
+++ 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)
 {

   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)
 {
 

   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);

   return MY_AES_BAD_DATA;
 }
 
--- sql-common/client.c.orig	2019-07-16 14:08:43 UTC
index 19faefe8323..f1192306ccb 100644
--- sql-common/client.c.orig
+++ sql-common/client.c
@@ -1968,7 +1968,11 @@ static int ssl_verify_server_cert(Vio *vio, const char
     goto error;
   }
 

 
   // 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
index 4acff4e4d9b..307778771be 100644
--- sql/mysqld.cc.orig
+++ sql/mysqld.cc
@@ -4511,7 +4511,11 @@ static int init_ssl()
 {
 #ifdef HAVE_OPENSSL
 #ifndef HAVE_YASSL

 #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

+#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
index aee13e12cb2..37a20870bd4 100644
--- sql/rpl_slave.cc.orig
+++ sql/rpl_slave.cc
@@ -5258,7 +5258,9 @@ err:
   mysql_mutex_unlock(&mi->run_lock);
   DBUG_LEAVE;                                   // Must match DBUG_ENTER()
   my_thread_end();

   pthread_exit(0);
   return(0);                                    // Avoid compiler warnings
 }
@@ -5449,7 +5451,9 @@ err:
   }
 
   my_thread_end();

   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();

   pthread_exit(0);
   return 0;                             // Avoid compiler warnings
 }
--- vio/viossl.c.orig	2019-07-16 14:08:43 UTC
index 5622cb7ee92..f738570f832 100644
--- vio/viossl.c.orig
+++ 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);

       }
   }
 #endif
--- vio/viosslfactories.c.orig	2019-07-16 14:08:43 UTC
index f50678a37b3..d3891fd8b12 100644
--- vio/viosslfactories.c.orig
+++ 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()))
   {




--- 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})

 MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
 TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
 
@@ -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)

 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
 TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
 
@@ -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)

 
 # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
 IF(WIN32)
@@ -82,11 +90,6 @@ ENDIF(WIN32)
 SET_TARGET_PROPERTIES (
   mysql_plugin 
   mysql_upgrade




--- cmake/plugin.cmake.orig	2019-07-16 14:08:43 UTC
+++ cmake/plugin.cmake
@@ -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"

Lines 1-4 Link Here

(-)files/patch-extra_CMakeLists.txt (-2 / +2 lines)
1	--- extra/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC	1	--- extra/CMakeLists.txt.orig 2019-07-16 14:08:43 UTC
2	+++ extra/CMakeLists.txt	2	+++ extra/CMakeLists.txt
3	@@ -101,8 +101,10 @@ IF(UNIX)	3	@@ -101,8 +101,10 @@ IF(UNIX)
4	MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)	4	MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
Lines 8-13 Link Here
8	MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)	8	MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
9	TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl)	9	TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl)
10	SET_TARGET_PROPERTIES(mysql_waitpid PROPERTIES LINKER_LANGUAGE CXX)	10	SET_TARGET_PROPERTIES(mysql_waitpid PROPERTIES LINKER_LANGUAGE CXX)
		11	+ENDIF()
11	ENDIF()	12	ENDIF()
12	+ENDIF()
13		13

Lines 1-6 Link Here

(-)files/patch-include_my__compare.h (-3 / +3 lines)
1	--- include/my_compare.h.orig 2011-05-10 09:46:46.000000000 +0200	1	--- include/my_compare.h.orig 2019-07-16 14:08:43 UTC
2	+++ include/my_compare.h 2011-05-10 09:47:01.000000000 +0200	2	+++ include/my_compare.h
3	@@ -39,7 +39,7 @@	3	@@ -39,7 +39,7 @@ extern "C" {
4	But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.	4	But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
5	*/	5	*/
6		6




--- mysys_ssl/my_default.cc.orig	2019-07-16 14:08:43 UTC
+++ mysys_ssl/my_default.cc
@@ -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

 #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
     strncpy(wsrep_defaults_file, name, sizeof(wsrep_defaults_file) - 1);
 #endif /* WITH_WSREP */
 
+  if (strstr(name, "/etc") == name)
+  {

   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)
             end[(strlen(end)-1)] = ' ';
           else
             strxmov(end, conf_file, *ext , " ",  NullS);

         }
       }
     }
@@ -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/mysql/", dirs);
 
 #endif
 
   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)))

Lines 1-5 Link Here

(-)files/patch-plugin_password__validation_validate__password.cc (-3 / +3 lines)
1	--- plugin/password_validation/validate_password.cc.orig 2013-09-10 07:38:25.000000000 +0000	1	--- plugin/password_validation/validate_password.cc.orig 2019-07-16 14:08:43 UTC
2	+++ plugin/password_validation/validate_password.cc 2013-10-05 15:40:20.790380179 +0000	2	+++ plugin/password_validation/validate_password.cc
3	@@ -16,6 +16,8 @@	3	@@ -16,6 +16,8 @@
4	#include <my_sys.h>	4	#include <my_sys.h>
5	#include <string>	5	#include <string>
Lines 7-11 Link Here
7	+/* solve clash between libc++ bitset::test() and test macro from my_global.h */	7	+/* solve clash between libc++ bitset::test() and test macro from my_global.h */
8	+#undef test	8	+#undef test
9	#include <set>	9	#include <set>
		10	#include <ios> // std::streamoff
10	#include <iostream>	11	#include <iostream>
11	#include <fstream>




--- scripts/CMakeLists.txt.orig	2019-07-16 14:08:43 UTC
+++ scripts/CMakeLists.txt
@@ -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} " ) 

         ELSE()
           SET(${var} "${${var}}-l${lib} " ) 
         ENDIF()
@@ -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

     mysqlhotcopy
     mysqldumpslow
     mysqld_multi
@@ -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

Lines 1-6 Link Here

(-)files/patch-scripts_mysqld__safe.sh (-4 / +4 lines)
1	--- scripts/mysqld_safe.sh.orig 2007-10-08 10:39:23.000000000 +0200	1	--- scripts/mysqld_safe.sh.orig 2019-07-19 08:39:37 UTC
2	+++ scripts/mysqld_safe.sh 2007-10-08 10:40:52.000000000 +0200	2	+++ scripts/mysqld_safe.sh
3	@@ -242,10 +242,10 @@	3	@@ -568,10 +568,10 @@ fi
4		4
5	if test -z "$MYSQL_HOME"	5	if test -z "$MYSQL_HOME"
6	then	6	then
Lines 13-19 Link Here
13	$DATADIR/my.cnf	13	$DATADIR/my.cnf
14	IGNORING $DATADIR/my.cnf"	14	IGNORING $DATADIR/my.cnf"
15		15
16	@@ -254,7 +254,7 @@	16	@@ -580,7 +580,7 @@ IGNORING $DATADIR/my.cnf"
17	then	17	then
18	log_error "WARNING: Found $DATADIR/my.cnf	18	log_error "WARNING: Found $DATADIR/my.cnf
19	The data directory is a deprecated location for my.cnf, please move it to	19	The data directory is a deprecated location for my.cnf, please move it to

Lines 1-7 Link Here

(-)files/patch-sql_CMakeLists.txt (-6 / +23 lines)
1	--- sql/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC	1	--- sql/CMakeLists.txt.orig 2019-07-16 14:08:43 UTC
2	+++ sql/CMakeLists.txt	2	+++ sql/CMakeLists.txt
3	@@ -472,6 +472,7 @@ ADD_CUSTOM_TARGET(distclean	3	@@ -435,7 +435,7 @@ ADD_CUSTOM_TARGET(
		4	DEPENDS ${GEN_DIGEST_SOURCES}
		5	)
4		6
		7	-
		8	+IF(FALSE)
		9	MYSQL_ADD_PLUGIN(udf_example udf_example.cc
		10	MODULE_ONLY TEST_ONLY MODULE_OUTPUT_NAME "udf_example")
		11	IF(NOT DISABLE_SHARED)
		12	@@ -445,6 +445,7 @@ IF(NOT DISABLE_SHARED)
		13	"/DEF:${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def")
		14	ENDIF()
		15	ENDIF()
		16	+ENDIF()
		17
		18	FOREACH(tool gtar tar git)
		19	STRING(TOUPPER ${tool} TOOL)
		20	@@ -470,6 +471,7 @@ ADD_CUSTOM_TARGET(distclean
		21
5	IF(INSTALL_LAYOUT STREQUAL "STANDALONE")	22	IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
6		23
7	+IF(FALSE)	24	+IF(FALSE)
Lines 8-18 Link Here
8	# Copy db.opt into data/test/	25	# Copy db.opt into data/test/
9	SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt )	26	SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt )
10	INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles)	27	INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles)
11	@@ -516,6 +517,7 @@ ELSE()	28	@@ -512,6 +514,7 @@ IF(WIN32 AND MYSQLD_EXECUTABLE)
		29	ELSE()
		30	# Not windows or cross compiling, just install an empty directory
12	INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)	31	INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
		32	+ENDIF()
13	ENDIF()	33	ENDIF()
14	ENDIF()	34	ENDIF()
15	+ENDIF()
16		35
17	ADD_CUSTOM_TARGET(show-dist-name
18	COMMAND ${CMAKE_COMMAND} -E echo "${CPACK_PACKAGE_FILE_NAME}"




--- 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),

 
 static Sys_var_ulong Sys_join_buffer_size(
        "join_buffer_size",
@@ -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),

        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(
        "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),

        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(
        "The number of seconds the server waits for activity on a "
        "connection before closing it",
        SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),

+       VALID_RANGE(1, INT_MAX32/1000),
        DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
 
 static Sys_var_plugin Sys_default_storage_engine(

Lines 1-6 Link Here

(-)files/patch-support-files_CMakeLists.txt (-2 / +2 lines)
1	--- support-files/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC	1	--- support-files/CMakeLists.txt.orig 2019-07-16 14:08:43 UTC
2	+++ support-files/CMakeLists.txt	2	+++ support-files/CMakeLists.txt
3	@@ -69,7 +69,9 @@ IF(UNIX)	3	@@ -74,7 +74,9 @@ IF(UNIX)
4	INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)	4	INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
5	ENDIF()	5	ENDIF()
6		6

Return to bug 239373

Lines 2-10 Link Here

(-)Makefile (-4 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mysqlwsrep	4	PORTNAME= mysqlwsrep
5	PORTVERSION?= 5.6.43	5	PORTVERSION?= 5.6.44
6	DISTVERSIONPREFIX?= wsrep_	6	DISTVERSIONPREFIX?= wsrep_
7	DISTVERSIONSUFFIX?= -25.25	7	DISTVERSIONSUFFIX?= -25.26
8	CATEGORIES= databases ipv6	8	CATEGORIES= databases ipv6
9	PKGNAMESUFFIX= 56-server	9	PKGNAMESUFFIX= 56-server
10		10
Lines 23-30 Link Here
23	socat:net/socat	23	socat:net/socat
24	LIB_DEPENDS= libevent.so:devel/libevent liblz4.so:archivers/liblz4	24	LIB_DEPENDS= libevent.so:devel/libevent liblz4.so:archivers/liblz4
25		25
26	BROKEN_SSL= openssl111	26	#BROKEN_SSL= openssl111
27	BROKEN_SSL_REASON_openssl111= incomplete definition of type 'struct dh_st'	27	#BROKEN_SSL_REASON_openssl111= incomplete definition of type 'struct dh_st'
28		28
29	DATADIR= ${PREFIX}/share/mysql	29	DATADIR= ${PREFIX}/share/mysql
30	ETCDIR= ${PREFIX}/etc/mysql	30	ETCDIR= ${PREFIX}/etc/mysql

Lines 1-6 Link Here

(-)files/patch-CMakeLists.txt (-7 / +7 lines)
1	--- CMakeLists.txt.orig 2017-01-25 07:58:07 UTC	1	--- CMakeLists.txt.orig 2019-07-16 14:08:43 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -499,12 +499,10 @@ IF(UNIX)	3	@@ -532,12 +532,10 @@ IF(UNIX)
4	ENDIF()	4	ENDIF()
5		5
6	IF(NOT WITHOUT_SERVER)	6	IF(NOT WITHOUT_SERVER)
Lines 13-19 Link Here
13	ENDIF(WITH_EMBEDDED_SERVER)	13	ENDIF(WITH_EMBEDDED_SERVER)
14	ENDIF()	14	ENDIF()
15		15
16	@@ -513,10 +511,7 @@ ENDIF()	16	@@ -546,10 +544,7 @@ ENDIF()
17	ADD_SUBDIRECTORY(scripts)	17	ADD_SUBDIRECTORY(scripts)
18		18
19	IF(NOT WITHOUT_SERVER)	19	IF(NOT WITHOUT_SERVER)
Lines 24-30 Link Here
24	IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)	24	IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
25	ADD_SUBDIRECTORY(internal)	25	ADD_SUBDIRECTORY(internal)
26	ENDIF()	26	ENDIF()
27	@@ -574,6 +569,7 @@ ENDIF()	27	@@ -608,6 +603,7 @@ ENDIF()
28	#	28	#
29	# RPM installs documentation directly from the source tree	29	# RPM installs documentation directly from the source tree
30	#	30	#
Lines 32-42 Link Here
32	IF(NOT INSTALL_LAYOUT MATCHES "RPM")	32	IF(NOT INSTALL_LAYOUT MATCHES "RPM")
33	INSTALL(FILES COPYING LICENSE.mysql	33	INSTALL(FILES COPYING LICENSE.mysql
34	DESTINATION ${INSTALL_DOCREADMEDIR}	34	DESTINATION ${INSTALL_DOCREADMEDIR}
35	@@ -597,6 +593,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")	35	@@ -630,6 +626,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
		36	PATTERN "mysql.info" EXCLUDE
36	PATTERN "sp-imp-spec.txt" EXCLUDE	37	PATTERN "sp-imp-spec.txt" EXCLUDE
37	)	38	)
		39	+ENDIF()
38	ENDIF()	40	ENDIF()
39	+ENDIF()
40		41
41	INCLUDE(CPack)	42	INCLUDE(CPack)
42

Lines 1-6 Link Here

(-)files/patch-PR225888.diff (-41 / +25 lines)
1	diff --git extra/yassl/include/openssl/ssl.h extra/yassl/include/openssl/ssl.h	1	--- extra/yassl/include/openssl/ssl.h.orig 2019-07-16 14:08:43 UTC
2	index 10fa4913b7e..ff6cb696661 100644
3	--- extra/yassl/include/openssl/ssl.h.orig
4	+++ extra/yassl/include/openssl/ssl.h	2	+++ extra/yassl/include/openssl/ssl.h
5	@@ -1,5 +1,5 @@	3	@@ -1,5 +1,5 @@
6	/*	4	/*
Lines 18-26 Link Here
18	unsigned long ERR_get_error(void);	16	unsigned long ERR_get_error(void);
19	unsigned long ERR_peek_error(void);	17	unsigned long ERR_peek_error(void);
20	int ERR_GET_REASON(int);	18	int ERR_GET_REASON(int);
21	diff --git extra/yassl/src/ssl.cpp extra/yassl/src/ssl.cpp	19	--- extra/yassl/src/ssl.cpp.orig 2019-07-16 14:08:43 UTC
22	index 39244a01b92..c992d446487 100644
23	--- extra/yassl/src/ssl.cpp.orig
24	+++ extra/yassl/src/ssl.cpp	20	+++ extra/yassl/src/ssl.cpp
25	@@ -1,5 +1,5 @@	21	@@ -1,5 +1,5 @@
26	/*	22	/*
Lines 29-35 Link Here
29		25
30	This program is free software; you can redistribute it and/or modify	26	This program is free software; you can redistribute it and/or modify
31	it under the terms of the GNU General Public License as published by	27	it under the terms of the GNU General Public License as published by
32	@@ -1615,7 +1615,7 @@ int SSLeay_add_ssl_algorithms() // compatibility only	28	@@ -1516,7 +1516,7 @@ int SSLeay_add_ssl_algorithms() // compatibility only
33	}	29	}
34		30
35		31
Lines 38-54 Link Here
38	{	34	{
39	GetErrors().Remove();	35	GetErrors().Remove();
40	}	36	}
41	diff --git mysys_ssl/my_aes_openssl.cc mysys_ssl/my_aes_openssl.cc	37	--- mysys_ssl/my_aes_openssl.cc.orig 2019-07-16 14:08:43 UTC
42	index 261ba8ab732..a0f8c147c7a 100644
43	--- mysys_ssl/my_aes_openssl.cc.orig
44	+++ mysys_ssl/my_aes_openssl.cc	38	+++ mysys_ssl/my_aes_openssl.cc
45	@@ -1,4 +1,4 @@	39	@@ -1,4 +1,4 @@
46	-/* Copyright (c) 2015, 2014 Oracle and/or its affiliates. All rights reserved.	40	-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
47	+/* Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.	41	+/* Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
48		42
49	This program is free software; you can redistribute it and/or modify	43	This program is free software; you can redistribute it and/or modify
50	it under the terms of the GNU General Public License as published by	44	it under the terms of the GNU General Public License as published by
51	@@ -122,33 +122,46 @@ int my_aes_encrypt(const unsigned char *source, uint32 source_length,	45	@@ -108,33 +108,46 @@ int my_aes_encrypt(const unsigned char *source, uint32
52	const unsigned char *key, uint32 key_length,	46	const unsigned char *key, uint32 key_length,
53	enum my_aes_opmode mode, const unsigned char *iv)	47	enum my_aes_opmode mode, const unsigned char *iv)
54	{	48	{
Lines 103-109 Link Here
103	return MY_AES_BAD_DATA;	97	return MY_AES_BAD_DATA;
104	}	98	}
105		99
106	@@ -159,7 +172,12 @@ int my_aes_decrypt(const unsigned char *source, uint32 source_length,	100	@@ -145,7 +158,12 @@ int my_aes_decrypt(const unsigned char *source, uint32
107	enum my_aes_opmode mode, const unsigned char *iv)	101	enum my_aes_opmode mode, const unsigned char *iv)
108	{	102	{
109		103
Lines 117-123 Link Here
117	const EVP_CIPHER *cipher= aes_evp_type(mode);	111	const EVP_CIPHER *cipher= aes_evp_type(mode);
118	int u_len, f_len;	112	int u_len, f_len;
119		113
120	@@ -167,27 +185,34 @@ int my_aes_decrypt(const unsigned char *source, uint32 source_length,	114	@@ -153,27 +171,34 @@ int my_aes_decrypt(const unsigned char *source, uint32
121	unsigned char rkey[MAX_AES_KEY_LENGTH / 8];	115	unsigned char rkey[MAX_AES_KEY_LENGTH / 8];
122		116
123	my_aes_create_key(key, key_length, rkey, mode);	117	my_aes_create_key(key, key_length, rkey, mode);
Lines 161-171 Link Here
161	return MY_AES_BAD_DATA;	155	return MY_AES_BAD_DATA;
162	}	156	}
163		157
164	diff --git sql-common/client.c sql-common/client.c	158	--- sql-common/client.c.orig 2019-07-16 14:08:43 UTC
165	index 19faefe8323..f1192306ccb 100644
166	--- sql-common/client.c.orig
167	+++ sql-common/client.c	159	+++ sql-common/client.c
168	@@ -2744,7 +2744,11 @@ static int ssl_verify_server_cert(Vio vio, const char server_hostname, const c	160	@@ -1968,7 +1968,11 @@ static int ssl_verify_server_cert(Vio *vio, const char
169	goto error;	161	goto error;
170	}	162	}
171		163
Lines 177-187 Link Here
177		169
178	// There should not be any NULL embedded in the CN	170	// There should not be any NULL embedded in the CN
179	if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn))	171	if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn))
180	diff --git sql/mysqld.cc sql/mysqld.cc	172	--- sql/mysqld.cc.orig 2019-07-16 14:08:43 UTC
181	index 4acff4e4d9b..307778771be 100644
182	--- sql/mysqld.cc.orig
183	+++ sql/mysqld.cc	173	+++ sql/mysqld.cc
184	@@ -3408,7 +3408,11 @@ static int init_ssl()	174	@@ -4511,7 +4511,11 @@ static int init_ssl()
185	{	175	{
186	#ifdef HAVE_OPENSSL	176	#ifdef HAVE_OPENSSL
187	#ifndef HAVE_YASSL	177	#ifndef HAVE_YASSL
Lines 193-201 Link Here
193	#endif	183	#endif
194	ssl_start();	184	ssl_start();
195	#ifndef EMBEDDED_LIBRARY	185	#ifndef EMBEDDED_LIBRARY
196	@@ -3434,7 +3438,9 @@ static int init_ssl()	186	@@ -4525,7 +4529,9 @@ static int init_ssl()
197	opt_ssl_cipher, &error,	187	opt_ssl_cipher, &error,
198	opt_ssl_crl, opt_ssl_crlpath, ssl_ctx_flags);	188	opt_ssl_crl, opt_ssl_crlpath);
199	DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd));	189	DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd));
200	- ERR_remove_state(0);	190	- ERR_remove_state(0);
201	+#if OPENSSL_VERSION_NUMBER < 0x10100000L	191	+#if OPENSSL_VERSION_NUMBER < 0x10100000L
Lines 203-214 Link Here
203	+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */	193	+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
204	if (!ssl_acceptor_fd)	194	if (!ssl_acceptor_fd)
205	{	195	{
206	/*	196	sql_print_warning("Failed to setup SSL");
207	diff --git sql/rpl_slave.cc sql/rpl_slave.cc	197	--- sql/rpl_slave.cc.orig 2019-07-16 14:08:43 UTC
208	index aee13e12cb2..37a20870bd4 100644
209	--- sql/rpl_slave.cc.orig
210	+++ sql/rpl_slave.cc	198	+++ sql/rpl_slave.cc
211	@@ -6026,7 +6026,9 @@ ignore_log_space_limit=%d",	199	@@ -5258,7 +5258,9 @@ err:
212	mysql_mutex_unlock(&mi->run_lock);	200	mysql_mutex_unlock(&mi->run_lock);
213	DBUG_LEAVE; // Must match DBUG_ENTER()	201	DBUG_LEAVE; // Must match DBUG_ENTER()
214	my_thread_end();	202	my_thread_end();
Lines 219-225 Link Here
219	pthread_exit(0);	207	pthread_exit(0);
220	return(0); // Avoid compiler warnings	208	return(0); // Avoid compiler warnings
221	}	209	}
222	@@ -6256,7 +6258,9 @@ extern "C" void handle_slave_worker(void arg)	210	@@ -5449,7 +5451,9 @@ err:
223	}	211	}
224		212
225	my_thread_end();	213	my_thread_end();
Lines 230-236 Link Here
230	pthread_exit(0);	218	pthread_exit(0);
231	DBUG_RETURN(0);	219	DBUG_RETURN(0);
232	}	220	}
233	@@ -7597,7 +7601,9 @@ llstr(rli->get_group_master_log_pos(), llbuff));	221	@@ -6663,7 +6667,9 @@ log '%s' at position %s, relay log '%s' position: %s",
234		222
235	DBUG_LEAVE; // Must match DBUG_ENTER()	223	DBUG_LEAVE; // Must match DBUG_ENTER()
236	my_thread_end();	224	my_thread_end();
Lines 241-257 Link Here
241	pthread_exit(0);	229	pthread_exit(0);
242	return 0; // Avoid compiler warnings	230	return 0; // Avoid compiler warnings
243	}	231	}
244	diff --git vio/viossl.c vio/viossl.c	232	--- vio/viossl.c.orig 2019-07-16 14:08:43 UTC
245	index 5622cb7ee92..f738570f832 100644
246	--- vio/viossl.c.orig
247	+++ vio/viossl.c	233	+++ vio/viossl.c
248	@@ -1,4 +1,4 @@	234	@@ -1,4 +1,4 @@
249	-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.	235	-/* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
250	+/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.	236	+/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
251		237
252	This program is free software; you can redistribute it and/or modify	238	This program is free software; you can redistribute it and/or modify
253	it under the terms of the GNU General Public License as published by	239	it under the terms of the GNU General Public License as published by
254	@@ -419,7 +421,11 @@ static int ssl_do(struct st_VioSSLFd ptr, Vio vio, long timeout,	240	@@ -415,7 +415,11 @@ static int ssl_do(struct st_VioSSLFd ptr, Vio vio,
255	for (j = 0; j < n; j++)	241	for (j = 0; j < n; j++)
256	{	242	{
257	SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);	243	SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
Lines 263-279 Link Here
263	}	249	}
264	}	250	}
265	#endif	251	#endif
266	diff --git vio/viosslfactories.c vio/viosslfactories.c	252	--- vio/viosslfactories.c.orig 2019-07-16 14:08:43 UTC
267	index f50678a37b3..d3891fd8b12 100644
268	--- vio/viosslfactories.c.orig
269	+++ vio/viosslfactories.c	253	+++ vio/viosslfactories.c
270	@@ -1,4 +1,4 @@	254	@@ -1,4 +1,4 @@
271	-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.	255	-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
272	+/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.	256	+/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
273		257
274	This program is free software; you can redistribute it and/or modify	258	This program is free software; you can redistribute it and/or modify
275	it under the terms of the GNU General Public License as published by	259	it under the terms of the GNU General Public License as published by
276	@@ -121,13 +121,21 @@ static DH *get_dh2048(void)	260	@@ -68,13 +68,21 @@ static DH *get_dh2048(void)
277	DH *dh;	261	DH *dh;
278	if ((dh=DH_new()))	262	if ((dh=DH_new()))
279	{	263	{

Lines 1-6 Link Here

(-)files/patch-client_CMakeLists.txt (-6 / +6 lines)
1	--- client/CMakeLists.txt.orig 2018-01-31 14:03:53.000000000 +0100	1	--- client/CMakeLists.txt.orig 2019-07-16 14:08:43 UTC
2	+++ client/CMakeLists.txt 2018-02-07 11:27:46.846686000 +0100	2	+++ client/CMakeLists.txt
3	@@ -31,17 +31,20 @@	3	@@ -30,17 +30,20 @@ INCLUDE_DIRECTORIES(
4	COPY_OPENSSL_DLLS(copy_openssl_client)	4	COPY_OPENSSL_DLLS(copy_openssl_client)
5		5
6	ADD_DEFINITIONS(${SSL_DEFINES})	6	ADD_DEFINITIONS(${SSL_DEFINES})
Lines 21-27 Link Here
21	MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)	21	MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
22	TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)	22	TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
23		23
24	@@ -51,17 +54,21 @@	24	@@ -50,17 +53,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlclient)
25	MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)	25	MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
26	SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")	26	SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
27	TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)	27	TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
Lines 43-49 Link Here
43	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)	43	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
44	TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)	44	TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
45		45
46	@@ -74,6 +81,7 @@	46	@@ -73,6 +80,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
47		47
48	MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)	48	MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
49	TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)	49	TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
Lines 51-57 Link Here
51		51
52	# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".	52	# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
53	IF(WIN32)	53	IF(WIN32)
54	@@ -83,11 +91,6 @@	54	@@ -82,11 +90,6 @@ ENDIF(WIN32)
55	SET_TARGET_PROPERTIES (	55	SET_TARGET_PROPERTIES (
56	mysql_plugin	56	mysql_plugin
57	mysql_upgrade	57	mysql_upgrade

Lines 1-10 Link Here

(-)files/patch-cmake_plugin.cmake (-9 / +11 lines)
1	--- cmake/plugin.cmake.orig 2017-01-25 07:58:07 UTC	1	--- cmake/plugin.cmake.orig 2019-07-16 14:08:43 UTC
2	+++ cmake/plugin.cmake	2	+++ cmake/plugin.cmake
3	@@ -205,7 +205,6 @@ MACRO(MYSQL_ADD_PLUGIN)	3	@@ -216,9 +216,6 @@ MACRO(MYSQL_ADD_PLUGIN)
4	OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}")	4	MYSQL_INSTALL_TARGETS(${target}
5	# Install dynamic library	5	DESTINATION ${INSTALL_PLUGINDIR}
6	MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT Server)	6	COMPONENT ${INSTALL_COMPONENT})
7	- INSTALL_DEBUG_TARGET(${target} DESTINATION ${INSTALL_PLUGINDIR}/debug)	7	- INSTALL_DEBUG_TARGET(${target}
8	# Add installed files to list for RPMs	8	- DESTINATION ${INSTALL_PLUGINDIR}/debug
9	FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files	9	- COMPONENT ${INSTALL_COMPONENT})
10	"%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"	10	# Add installed files to list for RPMs
		11	FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
		12	"%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"

Lines 1-7 Link Here

(-)files/patch-mysys__ssl_my__default.cc (-13 / +14 lines)
1	--- mysys_ssl/my_default.cc.orig 2016-11-28 13:36:22 UTC	1	--- mysys_ssl/my_default.cc.orig 2019-07-16 14:08:43 UTC
2	+++ mysys_ssl/my_default.cc	2	+++ mysys_ssl/my_default.cc
3	@@ -110,7 +110,7 @@ static my_bool defaults_already_read= FA	3	@@ -116,7 +116,7 @@ char wsrep_defaults_group_suffix[FN_EXTLEN]={0,};
4		4	#endif /* WITH_WREP */
5	/* Which directories are searched for options (and in which order) */	5	/* Which directories are searched for options (and in which order) */
6		6
7	-#define MAX_DEFAULT_DIRS 6	7	-#define MAX_DEFAULT_DIRS 6
Lines 9-17 Link Here
9	#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */	9	#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
10	static const char **default_directories = NULL;	10	static const char **default_directories = NULL;
11		11
12	@@ -903,6 +903,14 @@ static int search_default_file_with_ext(	12	@@ -921,6 +921,14 @@ static int search_default_file_with_ext(Process_option
13	return 1; /* Ignore wrong files */	13	strncpy(wsrep_defaults_file, name, sizeof(wsrep_defaults_file) - 1);
14	}	14	#endif /* WITH_WSREP */
15		15
16	+ if (strstr(name, "/etc") == name)	16	+ if (strstr(name, "/etc") == name)
17	+ {	17	+ {
Lines 24-30 Link Here
24	while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))	24	while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
25	{	25	{
26	line++;	26	line++;
27	@@ -1241,7 +1249,8 @@ void my_print_default_files(const char *	27	@@ -1259,7 +1267,8 @@ void my_print_default_files(const char *conf_file)
28	end[(strlen(end)-1)] = ' ';	28	end[(strlen(end)-1)] = ' ';
29	else	29	else
30	strxmov(end, conf_file, *ext , " ", NullS);	30	strxmov(end, conf_file, *ext , " ", NullS);
Lines 34-56 Link Here
34	}	34	}
35	}	35	}
36	}	36	}
37	@@ -1400,13 +1409,8 @@ static const char **init_default_directo	37	@@ -1418,14 +1427,9 @@ static const char **init_default_directories(MEM_ROOT
38		38
39	#else	39	#else
40		40
41	- errors += add_directory(alloc, "/etc/", dirs);	41	- errors += add_directory(alloc, "/etc/", dirs);
42	- errors += add_directory(alloc, "/etc/mysql/", dirs);	42	- errors += add_directory(alloc, "/etc/mysql/", dirs);
43	-	43	+ errors += add_directory(alloc, "/usr/local/etc/", dirs);
		44	+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
		45
44	-#if defined(DEFAULT_SYSCONFDIR)	46	-#if defined(DEFAULT_SYSCONFDIR)
45	- if (DEFAULT_SYSCONFDIR[0])	47	- if (DEFAULT_SYSCONFDIR[0])
46	- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);	48	- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
47	-#endif /* DEFAULT_SYSCONFDIR */	49	-#endif /* DEFAULT_SYSCONFDIR */
48	+ errors += add_directory(alloc, "/usr/local/etc/", dirs);	50	-
49	+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
50
51	#endif	51	#endif
52		52
53	@@ -1477,7 +1481,7 @@ int check_file_permissions(const char *f	53	if ((env= getenv("MYSQL_HOME")))
		54	@@ -1495,7 +1499,7 @@ int check_file_permissions(const char *file_name, my_b
54	MY_STAT stat_info;	55	MY_STAT stat_info;
55		56
56	if (!my_stat(file_name,&stat_info,MYF(0)))	57	if (!my_stat(file_name,&stat_info,MYF(0)))

Lines 1-6 Link Here

(-)files/patch-scripts_CMakeLists.txt (-4 / +4 lines)
1	--- scripts/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC	1	--- scripts/CMakeLists.txt.orig 2019-07-16 14:08:43 UTC
2	+++ scripts/CMakeLists.txt	2	+++ scripts/CMakeLists.txt
3	@@ -298,6 +298,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)	3	@@ -304,6 +304,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
4	GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)	4	GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
5	STRING(REGEX REPLACE "^lib" "" lib "${lib}")	5	STRING(REGEX REPLACE "^lib" "" lib "${lib}")
6	SET(${var} "${${var}}-l${lib} " )	6	SET(${var} "${${var}}-l${lib} " )
Lines 9-15 Link Here
9	ELSE()	9	ELSE()
10	SET(${var} "${${var}}-l${lib} " )	10	SET(${var} "${${var}}-l${lib} " )
11	ENDIF()	11	ENDIF()
12	@@ -360,15 +362,10 @@ ELSE()	12	@@ -366,15 +368,10 @@ ELSE()
13	# On Unix, most of the files end up in the bin directory	13	# On Unix, most of the files end up in the bin directory
14	SET(mysql_config_COMPONENT COMPONENT Development)	14	SET(mysql_config_COMPONENT COMPONENT Development)
15	SET(BIN_SCRIPTS	15	SET(BIN_SCRIPTS
Lines 25-31 Link Here
25	mysqlhotcopy	25	mysqlhotcopy
26	mysqldumpslow	26	mysqldumpslow
27	mysqld_multi	27	mysqld_multi
28	@@ -378,7 +375,7 @@ ELSE()	28	@@ -384,7 +381,7 @@ ELSE()
29	FOREACH(file ${BIN_SCRIPTS})	29	FOREACH(file ${BIN_SCRIPTS})
30	IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)	30	IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
31	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh	31	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh

Lines 1-6 Link Here

(-)files/patch-sql_sys__vars.cc (-7 / +7 lines)
1	--- sql/sys_vars.cc.orig 2012-06-15 17:03:32.000000000 +0200	1	--- sql/sys_vars.cc.orig 2019-07-16 14:08:43 UTC
2	+++ sql/sys_vars.cc 2012-06-15 17:16:23.000000000 +0200	2	+++ sql/sys_vars.cc
3	@@ -900,7 +900,7 @@	3	@@ -1415,7 +1415,7 @@ static Sys_var_ulong Sys_interactive_timeout(
4	"connection before closing it",	4	"connection before closing it",
5	SESSION_VAR(net_interactive_timeout),	5	SESSION_VAR(net_interactive_timeout),
6	CMD_LINE(REQUIRED_ARG),	6	CMD_LINE(REQUIRED_ARG),
Lines 9-15 Link Here
9		9
10	static Sys_var_ulong Sys_join_buffer_size(	10	static Sys_var_ulong Sys_join_buffer_size(
11	"join_buffer_size",	11	"join_buffer_size",
12	@@ -1401,7 +1401,7 @@	12	@@ -2034,7 +2034,7 @@ static Sys_var_ulong Sys_net_read_timeout(
13	"Number of seconds to wait for more data from a connection before "	13	"Number of seconds to wait for more data from a connection before "
14	"aborting the read",	14	"aborting the read",
15	SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),	15	SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
Lines 18-24 Link Here
18	NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),	18	NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
19	ON_UPDATE(fix_net_read_timeout));	19	ON_UPDATE(fix_net_read_timeout));
20		20
21	@@ -1416,7 +1416,7 @@	21	@@ -2049,7 +2049,7 @@ static Sys_var_ulong Sys_net_write_timeout(
22	"Number of seconds to wait for a block to be written to a connection "	22	"Number of seconds to wait for a block to be written to a connection "
23	"before aborting the write",	23	"before aborting the write",
24	SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),	24	SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
Lines 27-33 Link Here
27	NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),	27	NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
28	ON_UPDATE(fix_net_write_timeout));	28	ON_UPDATE(fix_net_write_timeout));
29		29
30	@@ -2257,7 +2257,7 @@	30	@@ -3182,7 +3182,7 @@ static Sys_var_ulong Sys_net_wait_timeout(
31	"The number of seconds the server waits for activity on a "	31	"The number of seconds the server waits for activity on a "
32	"connection before closing it",	32	"connection before closing it",
33	SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),	33	SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
Lines 35-38 Link Here
35	+ VALID_RANGE(1, INT_MAX32/1000),	35	+ VALID_RANGE(1, INT_MAX32/1000),
36	DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));	36	DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
37		37
38	/** propagates changes to the relevant flag of @@optimizer_switch */	38	static Sys_var_plugin Sys_default_storage_engine(