Attachment #219362 for bug #250508




# $FreeBSD$

PORTNAME=	mysqlwsrep
PORTVERSION?=	5.7.31
DISTVERSIONPREFIX?=	wsrep_
DISTVERSIONSUFFIX?=	-25.23
PORTREVISION?=	0
CATEGORIES=	databases
MASTER_SITES+=	SF/boost/boost/1.59.0:boost

USERS=		mysql
GROUPS=		mysql

USE_CXXSTD=     c++11
USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin

MMAN1=		my_print_defaults.1 \

.  endif
.endif

# Plugin innodb_memcached requires -fcommon to avoid duplicate symbol linker
# error with llmv11.
.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300109
CFLAGS+=	-fcommon
.endif

post-extract:
	${RM} -fv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h


Lines 1-7 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1591201597	1	TIMESTAMP = 1603213079
2	SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac	2	SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
3	SIZE (boost_1_59_0.tar.gz) = 83709983	3	SIZE (boost_1_59_0.tar.gz) = 83709983
4	SHA256 (codership-mysql-wsrep-wsrep_5.7.30-25.22_GH0.tar.gz) = 2fb00a0b6f644b1f37bdc2cdbee5f090fbc0377e66b06dbe1971943097a35658	4	SHA256 (codership-mysql-wsrep-wsrep_5.7.31-25.23_GH0.tar.gz) = 1a66f94778a37ce909e92e35eb3e5adb961708f105fe67281062185b93ab1945
5	SIZE (codership-mysql-wsrep-wsrep_5.7.30-25.22_GH0.tar.gz) = 54733023	5	SIZE (codership-mysql-wsrep-wsrep_5.7.31-25.23_GH0.tar.gz) = 54754887
6	SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0	6	SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
7	SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032	7	SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032




--- CMakeLists.txt.orig	2020-10-07 08:29:27 UTC
+++ CMakeLists.txt
@@ -739,12 +739,10 @@ IF(UNIX)
 ENDIF()
 
 IF(NOT WITHOUT_SERVER)

   ENDIF(WITH_EMBEDDED_SERVER)
 ENDIF()
 
@@ -753,8 +751,6 @@ ENDIF()
 ADD_SUBDIRECTORY(scripts)
 
 IF(NOT WITHOUT_SERVER)

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

 IF(NOT INSTALL_LAYOUT MATCHES "RPM")
   INSTALL(FILES
     README
@@ -834,6 +831,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
     PATTERN "mysql.info" EXCLUDE
     PATTERN "sp-imp-spec.txt" EXCLUDE
   )

Lines 1-6 Link Here

(-)files/patch-cmake_os_FreeBSD.cmake (-3 / +3 lines)
1	--- cmake/os/FreeBSD.cmake.orig 2018-10-04 05:48:22 UTC	1	--- cmake/os/FreeBSD.cmake.orig 2020-10-07 08:29:27 UTC
2	+++ cmake/os/FreeBSD.cmake	2	+++ cmake/os/FreeBSD.cmake
3	@@ -30,6 +30,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)	3	@@ -45,6 +45,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
4	IF(NOT HAVE_SUPPORTED_CLANG_VERSION)	4	IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
5	MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")	5	MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
6	ENDIF()	6	ENDIF()
Lines 21-27 Link Here
21	ELSE()	21	ELSE()
22	MESSAGE(FATAL_ERROR "Unsupported compiler!")	22	MESSAGE(FATAL_ERROR "Unsupported compiler!")
23	ENDIF()	23	ENDIF()
24	@@ -38,4 +52,6 @@ ENDIF()	24	@@ -53,4 +67,6 @@ ENDIF()
25	# Should not be needed any more, but kept for easy resurrection if needed	25	# Should not be needed any more, but kept for easy resurrection if needed
26	# #Legacy option, maybe not needed anymore , taken as is from autotools build	26	# #Legacy option, maybe not needed anymore , taken as is from autotools build
27	# ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000)	27	# ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000)




--- rapid/plugin/group_replication/src/recovery_state_transfer.cc.orig	2020-11-02 12:09:01 UTC
+++ rapid/plugin/group_replication/src/recovery_state_transfer.cc
@@ -711,6 +711,7 @@ int Recovery_state_transfer::purge_recovery_slave_thre
     donor_connection_interface.initialize_channel(const_cast<char*>("<NULL>"),
                                                   0,
                                                   NULL, NULL,
+                                                  false,
                                                   NULL,
                                                   NULL,
                                                   NULL,
@@ -718,8 +719,7 @@ int Recovery_state_transfer::purge_recovery_slave_thre
                                                   NULL,
                                                   NULL,
                                                   NULL,
-                                                  NULL,
-                                                  NULL,
+                                                  false,
                                                   DEFAULT_THREAD_PRIORITY,
                                                   1, false);
 




--- scripts/CMakeLists.txt.orig	2020-10-07 08:29:27 UTC
+++ scripts/CMakeLists.txt
@@ -330,6 +330,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()
@@ -415,14 +417,13 @@ ELSE()
   # On Unix, most of the files end up in the bin directory
   SET(mysql_config_COMPONENT COMPONENT Development)
 

       mysqldumpslow
       mysqld_multi
       mysqld_safe
@@ -466,7 +467,7 @@ ELSE()
   FOREACH(file ${BIN_SCRIPTS})
     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh




--- sql/binlog.cc.orig	2020-11-02 12:26:34 UTC
+++ sql/binlog.cc
@@ -10144,8 +10144,8 @@ void MYSQL_BIN_LOG::report_missing_purged_gtids(const 
 
   char* missing_gtids= NULL;
   char* slave_executed_gtids= NULL;
-  gtid_missing.to_string(&missing_gtids, NULL);
-  slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL);
+  gtid_missing.to_string(&missing_gtids, false);
+  slave_executed_gtid_set->to_string(&slave_executed_gtids, false);
 
   /*
      Log the information about the missing purged GTIDs to the error log
@@ -10216,8 +10216,8 @@ void MYSQL_BIN_LOG::report_missing_gtids(const Gtid_se
   Gtid_set gtid_missing(slave_executed_gtid_set->get_sid_map());
   gtid_missing.add_gtid_set(slave_executed_gtid_set);
   gtid_missing.remove_gtid_set(previous_gtid_set);
-  gtid_missing.to_string(&missing_gtids, NULL);
-  slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL);
+  gtid_missing.to_string(&missing_gtids, false);
+  slave_executed_gtid_set->to_string(&slave_executed_gtids, false);
 
   String tmp_uuid;
   uchar name[]= "slave_uuid";

Lines 1-4 Link Here

(-)files/patch-sql_sys__vars.cc (-2 / +2 lines)
1	--- sql/sys_vars.cc.orig 2019-10-21 05:21:41 UTC	1	--- sql/sys_vars.cc.orig 2020-10-07 08:29:27 UTC
2	+++ sql/sys_vars.cc	2	+++ sql/sys_vars.cc
3	@@ -1748,7 +1748,7 @@ static Sys_var_ulong Sys_interactive_timeout(	3	@@ -1748,7 +1748,7 @@ static Sys_var_ulong Sys_interactive_timeout(
4	"connection before closing it",	4	"connection before closing it",
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	@@ -4372,7 +4372,7 @@ static Sys_var_ulong Sys_net_wait_timeout(	30	@@ -4378,7 +4378,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),

Line 0 Link Here

(-)files/patch-storage_innobase_fsp_fsp0fsp.cc (+11 lines)
	1	--- storage/innobase/fsp/fsp0fsp.cc.orig 2020-11-02 10:59:53 UTC
	2	+++ storage/innobase/fsp/fsp0fsp.cc
	3	@@ -1281,7 +1281,7 @@ fsp_header_decode_encryption_info(
	4
	5	if (elen == MY_AES_BAD_DATA) {
	6	my_free(master_key);
	7	- return(NULL);
	8	+ return(false);
	9	}
	10
	11	/* Check checksum bytes. */

Return to bug 250508

Lines 2-10 Link Here

(-)Makefile (-2 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mysqlwsrep	4	PORTNAME= mysqlwsrep
5	PORTVERSION?= 5.7.30	5	PORTVERSION?= 5.7.31
6	DISTVERSIONPREFIX?= wsrep_	6	DISTVERSIONPREFIX?= wsrep_
7	DISTVERSIONSUFFIX?= -25.22	7	DISTVERSIONSUFFIX?= -25.23
8	PORTREVISION?= 0	8	PORTREVISION?= 0
9	CATEGORIES= databases	9	CATEGORIES= databases
10	MASTER_SITES+= SF/boost/boost/1.59.0:boost	10	MASTER_SITES+= SF/boost/boost/1.59.0:boost
Lines 99-104 Link Here
99	USERS= mysql	99	USERS= mysql
100	GROUPS= mysql	100	GROUPS= mysql
101		101
		102	USE_CXXSTD= c++11
102	USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin	103	USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin
103		104
104	MMAN1= my_print_defaults.1 \	105	MMAN1= my_print_defaults.1 \
Lines 185-190 Link Here
185	. endif	186	. endif
186	.endif	187	.endif
187		188
		189	# Plugin innodb_memcached requires -fcommon to avoid duplicate symbol linker
		190	# error with llmv11.
		191	.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300109
		192	CFLAGS+= -fcommon
		193	.endif
		194
188	post-extract:	195	post-extract:
189	${RM} -fv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h	196	${RM} -fv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
190		197

Lines 1-6 Link Here

(-)files/patch-CMakeLists.txt (-5 / +5 lines)
1	--- CMakeLists.txt.orig 2020-05-27 10:17:47 UTC	1	--- CMakeLists.txt.orig 2020-10-07 08:29:27 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -738,12 +738,10 @@ IF(UNIX)	3	@@ -739,12 +739,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	@@ -752,8 +750,6 @@ ENDIF()	16	@@ -753,8 +751,6 @@ ENDIF()
17	ADD_SUBDIRECTORY(scripts)	17	ADD_SUBDIRECTORY(scripts)
18		18
19	IF(NOT WITHOUT_SERVER)	19	IF(NOT WITHOUT_SERVER)
Lines 22-28 Link Here
22	ADD_SUBDIRECTORY(support-files)	22	ADD_SUBDIRECTORY(support-files)
23	IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)	23	IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
24	ADD_SUBDIRECTORY(internal)	24	ADD_SUBDIRECTORY(internal)
25	@@ -812,6 +808,7 @@ ENDIF()	25	@@ -813,6 +809,7 @@ ENDIF()
26	#	26	#
27	# RPM installs documentation directly from the source tree	27	# RPM installs documentation directly from the source tree
28	#	28	#
Lines 30-36 Link Here
30	IF(NOT INSTALL_LAYOUT MATCHES "RPM")	30	IF(NOT INSTALL_LAYOUT MATCHES "RPM")
31	INSTALL(FILES	31	INSTALL(FILES
32	README	32	README
33	@@ -833,6 +830,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")	33	@@ -834,6 +831,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
34	PATTERN "mysql.info" EXCLUDE	34	PATTERN "mysql.info" EXCLUDE
35	PATTERN "sp-imp-spec.txt" EXCLUDE	35	PATTERN "sp-imp-spec.txt" EXCLUDE
36	)	36	)

Line 0 Link Here

(-)files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc(working copy) (+20 lines)
	1	--- rapid/plugin/group_replication/src/recovery_state_transfer.cc.orig 2020-11-02 12:09:01 UTC
	2	+++ rapid/plugin/group_replication/src/recovery_state_transfer.cc
	3	@@ -711,6 +711,7 @@ int Recovery_state_transfer::purge_recovery_slave_thre
	4	donor_connection_interface.initialize_channel(const_cast<char*>("<NULL>"),
	5	0,
	6	NULL, NULL,
	7	+ false,
	8	NULL,
	9	NULL,
	10	NULL,
	11	@@ -718,8 +719,7 @@ int Recovery_state_transfer::purge_recovery_slave_thre
	12	NULL,
	13	NULL,
	14	NULL,
	15	- NULL,
	16	- NULL,
	17	+ false,
	18	DEFAULT_THREAD_PRIORITY,
	19	1, false);
	20

Lines 1-6 Link Here

(-)files/patch-scripts_CMakeLists.txt (-4 / +4 lines)
1	--- scripts/CMakeLists.txt.orig 2020-05-27 10:17:47 UTC	1	--- scripts/CMakeLists.txt.orig 2020-10-07 08:29:27 UTC
2	+++ scripts/CMakeLists.txt	2	+++ scripts/CMakeLists.txt
3	@@ -336,6 +336,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)	3	@@ -330,6 +330,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	@@ -421,14 +423,13 @@ ELSE()	12	@@ -415,14 +417,13 @@ 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		15
Lines 25-31 Link Here
25	mysqldumpslow	25	mysqldumpslow
26	mysqld_multi	26	mysqld_multi
27	mysqld_safe	27	mysqld_safe
28	@@ -472,7 +473,7 @@ ELSE()	28	@@ -466,7 +467,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

Line 0 Link Here

(-)files/patch-sql_binlog.cc (+24 lines)
	1	--- sql/binlog.cc.orig 2020-11-02 12:26:34 UTC
	2	+++ sql/binlog.cc
	3	@@ -10144,8 +10144,8 @@ void MYSQL_BIN_LOG::report_missing_purged_gtids(const
	4
	5	char* missing_gtids= NULL;
	6	char* slave_executed_gtids= NULL;
	7	- gtid_missing.to_string(&missing_gtids, NULL);
	8	- slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL);
	9	+ gtid_missing.to_string(&missing_gtids, false);
	10	+ slave_executed_gtid_set->to_string(&slave_executed_gtids, false);
	11
	12	/*
	13	Log the information about the missing purged GTIDs to the error log
	14	@@ -10216,8 +10216,8 @@ void MYSQL_BIN_LOG::report_missing_gtids(const Gtid_se
	15	Gtid_set gtid_missing(slave_executed_gtid_set->get_sid_map());
	16	gtid_missing.add_gtid_set(slave_executed_gtid_set);
	17	gtid_missing.remove_gtid_set(previous_gtid_set);
	18	- gtid_missing.to_string(&missing_gtids, NULL);
	19	- slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL);
	20	+ gtid_missing.to_string(&missing_gtids, false);
	21	+ slave_executed_gtid_set->to_string(&slave_executed_gtids, false);
	22
	23	String tmp_uuid;
	24	uchar name[]= "slave_uuid";