Attachment 221590 Details for Bug 252606 – Update to 5.7.32-25.24, Makefile and patch filename fixes

[patch] Update to 5.7.32-25.24, Makefile and patch filename fixes

mysqlwsrep57-server-5.7.32-25.24.patch (text/plain), 6.81 KB, created by devel on 2021-01-15 10:46:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: devel

Created: 2021-01-15 10:46:42 UTC

Size: 6.81 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 560761)
>+++ Makefile	(working copy)
>@@ -2,9 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	mysqlwsrep
>-PORTVERSION?=	5.7.31
>+PORTVERSION?=	5.7.32
> DISTVERSIONPREFIX?=	wsrep_
>-DISTVERSIONSUFFIX?=	-25.23
>+DISTVERSIONSUFFIX?=	-25.24
> PORTREVISION?=	0
> CATEGORIES=	databases
> MASTER_SITES+=	SF/boost/boost/1.59.0:boost
>@@ -99,7 +99,7 @@
> USERS=		mysql
> GROUPS=		mysql
> 
>-USE_CXXSTD=     c++11
>+USE_CXXSTD=	c++11
> USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
> 
> MMAN1=		my_print_defaults.1 \
>@@ -154,13 +154,14 @@
> PERFSCHM_DESC=		Enable "Performance Schema" by default (High RAM usage)
> OPTIONS_DEFAULT+=	PERFSCHM
> 
>-PERFSCHM_SUB_LIST+=	PERFSCHEMRC=""
>-PERFSCHM_SUB_LIST_OFF+=	PERFSCHEMRC="--skip-performance-schema"
>-FEDERATED_SUB_LIST+=	FEDER="--federated"
>-FEDERATED_SUB_LIST_OFF+=FEDER=""
>-
> .include <bsd.port.options.mk>
> 
>+.if ${PORT_OPTIONS:MPERFSCHM}
>+SUB_LIST+=	PERFSCHEMRC=""
>+.else
>+SUB_LIST+=	PERFSCHEMRC="--skip-performance-schema"
>+.endif
>+
> .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
> SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
> .else
>Index: distinfo
>===================================================================
>--- distinfo	(revision 560761)
>+++ distinfo	(working copy)
>@@ -1,7 +1,7 @@
>-TIMESTAMP = 1603213079
>+TIMESTAMP = 1610116726
> SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
> SIZE (boost_1_59_0.tar.gz) = 83709983
>-SHA256 (codership-mysql-wsrep-wsrep_5.7.31-25.23_GH0.tar.gz) = 1a66f94778a37ce909e92e35eb3e5adb961708f105fe67281062185b93ab1945
>-SIZE (codership-mysql-wsrep-wsrep_5.7.31-25.23_GH0.tar.gz) = 54754887
>+SHA256 (codership-mysql-wsrep-wsrep_5.7.32-25.24_GH0.tar.gz) = d32e05e9d330c7dcb04d339cfc966c25a5a2fb22f4ccb53a4d4b67e915b86a3b
>+SIZE (codership-mysql-wsrep-wsrep_5.7.32-25.24_GH0.tar.gz) = 56500483
> SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
> SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032
>Index: files/mysql-server.in
>===================================================================
>--- files/mysql-server.in	(revision 560761)
>+++ files/mysql-server.in	(working copy)
>@@ -53,7 +53,7 @@
> : ${hostname:=`/bin/hostname`}
> pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
> command="/usr/sbin/daemon"
>-command_args="-c -f %%PREFIX%%/bin/mysqld_safe ${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args} %%FEDER%% %%PERFSCHEMRC%%"
>+command_args="-c -f %%PREFIX%%/bin/mysqld_safe ${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args} %%PERFSCHEMRC%%"
> procname="%%PREFIX%%/libexec/mysqld"
> start_precmd="${name}_prestart"
> start_postcmd="${name}_poststart"
>Index: files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc
>===================================================================
>--- files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc	(nonexistent)
>+++ files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc	(working copy)
>@@ -0,0 +1,20 @@
>+--- 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);
>+ 
>
>Property changes on: files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc(working
>===================================================================
>--- files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc(working	(revision 560761)
>+++ files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc(working	(nonexistent)
>@@ -1,20 +0,0 @@
>---- 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);
>- 
>
>Property changes on: files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc(working
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 252606: 221489 | 221573 | 221590 | 221591