Attachment #221573 for bug #252606




# $FreeBSD$

PORTNAME=	mysqlwsrep
PORTVERSION?=	5.7.32
DISTVERSIONPREFIX?=	wsrep_
DISTVERSIONSUFFIX?=	-25.24
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 \

		resolve_stack_dump.1 \
		resolveip.1

OPTIONS_SUB=		YES
OPTIONS_GROUP=		STORAGE
OPTIONS_GROUP_STORAGE=	ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA
OPTIONS_SUB=		YES

Lines 1-7 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1603213079	1	TIMESTAMP = 1610116726
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.31-25.23_GH0.tar.gz) = 1a66f94778a37ce909e92e35eb3e5adb961708f105fe67281062185b93ab1945	4	SHA256 (codership-mysql-wsrep-wsrep_5.7.32-25.24_GH0.tar.gz) = d32e05e9d330c7dcb04d339cfc966c25a5a2fb22f4ccb53a4d4b67e915b86a3b
5	SIZE (codership-mysql-wsrep-wsrep_5.7.31-25.23_GH0.tar.gz) = 54754887	5	SIZE (codership-mysql-wsrep-wsrep_5.7.32-25.24_GH0.tar.gz) = 56500483
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




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




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

Return to bug 252606

Lines 2-10 Link Here

(-)Makefile (-3 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mysqlwsrep	4	PORTNAME= mysqlwsrep
5	PORTVERSION?= 5.7.31	5	PORTVERSION?= 5.7.32
6	DISTVERSIONPREFIX?= wsrep_	6	DISTVERSIONPREFIX?= wsrep_
7	DISTVERSIONSUFFIX?= -25.23	7	DISTVERSIONSUFFIX?= -25.24
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-105 Link Here
99	USERS= mysql	99	USERS= mysql
100	GROUPS= mysql	100	GROUPS= mysql
101		101
102	USE_CXXSTD= c++11	102	USE_CXXSTD= c++11
103	USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin	103	USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin
104		104
105	MMAN1= my_print_defaults.1 \	105	MMAN1= my_print_defaults.1 \
Lines 128-133 Link Here
128	resolve_stack_dump.1 \	128	resolve_stack_dump.1 \
129	resolveip.1	129	resolveip.1
130		130
		131	OPTIONS_SUB= YES
131	OPTIONS_GROUP= STORAGE	132	OPTIONS_GROUP= STORAGE
132	OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA	133	OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA
133	OPTIONS_SUB= YES	134	OPTIONS_SUB= YES

Line 0 Link Here

(-)files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc (+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