From nobody Thu Aug 25 17:33:57 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MD97968tKz4b3DR; Thu, 25 Aug 2022 17:33:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MD9795fHXz3Qr1; Thu, 25 Aug 2022 17:33:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661448837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BQncRQi9U0p86GX/2X/irsKaUr0du/Ro5SE4ue5oM3I=; b=sOlj+wqUF18L+RraYU73g1d4ZKFupzPlnY2gyqZfD0EStvgtRS1zWLeAurvlP/kBBKDMZk UVeY0rbGyslLr22FLi+V7WK0hZSscYHUvpVuH7626hVSF+3IGGiVfhdNtL1BA1yeEuN8re 8rEOkbKWxt+SQPC91UCMOxJq/zygz+eJSoYc9w6Eqj6d2oC2pDWRsGZ4oP189joVwaPQTr d7VveMe99popw6YINQWZadVgMsG7VMuSJn/Xe6oME2dWnd50FQlRrWNdfLFYdUeZQ2c/WS XYEBOBMM2X5/7q395ddRirMSZIRxNsJJg2Ka3bwcsGN/9T2fCdvgdQWXV9Tqug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MD9794jBSzwkf; Thu, 25 Aug 2022 17:33:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27PHXvcQ047037; Thu, 25 Aug 2022 17:33:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27PHXv4a047036; Thu, 25 Aug 2022 17:33:57 GMT (envelope-from git) Date: Thu, 25 Aug 2022 17:33:57 GMT Message-Id: <202208251733.27PHXv4a047036@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 40a7e69af6ca - main - databases/mysqlwsrep57-server: Update to 5.7.38-25.30 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 40a7e69af6cae46067fefbea74d7cd900e6bc24f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661448837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BQncRQi9U0p86GX/2X/irsKaUr0du/Ro5SE4ue5oM3I=; b=Z/bpOeHQDii83XTxoUfBXL2UQoTJQ221Er0aSsGkSmJG5qI95zFf4AG2TK9zrtdUWVIMCj 6WnpfIzgMAuoSR30E+6O95OyXQeuo9T1nxpjM/b3ZfBvk2vHLZyXYLRR1dBBu9x9EVvUpI 3oplFQDVKtCSjQcqKsbnjaU5v95MWGZmMyDi7EePqQJtyu92c3zmYYuDhaGut3ul57zy0V 7/lcJb8VjNwUAzkUUthsxcSzA5tXvTeJFWfB89jBC4ybht/hR4ux5cxP+4yynQNWyz+6p5 3qc1l/+iXzKsJfKw+pe0C7wrelSY6WtC0tviS6PqLgn7gfh9j6n7Mc11BsQpyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661448837; a=rsa-sha256; cv=none; b=YYnBAJdm+ijdkQzBjoE4x3CrOf/KeTrPKrUvszwQCFSyJ2Uzy9rX2NskvEXu2jNpYenH5Z zvnwUqfevI3BkwSGCLyKvrp6nZBcMnn4tIZq/Etu24Q0mUe3NhvupnrhIf8ExryBMI3VJd 1roEJuT+Eq0bsLUKCA+vOgFCYwzmcCMXlxrJy6J/L2itnC7OSQbx39EswhYHqkdtlP+JgF I5+hQINQ+a6bMfjGgbxAFR7/l0uDttrMRximw1OPwckDzFUzOknIDZLuV5eXyZzkw1dSw/ GeilA1TAQKtR4qyWfM3dUf4ckadIe78i9nU99eih1dC6Vn2XCnYMtpwlK32k7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=40a7e69af6cae46067fefbea74d7cd900e6bc24f commit 40a7e69af6cae46067fefbea74d7cd900e6bc24f Author: No Name AuthorDate: 2022-08-25 17:33:20 +0000 Commit: Neel Chauhan CommitDate: 2022-08-25 17:33:20 +0000 databases/mysqlwsrep57-server: Update to 5.7.38-25.30 Changes: http://releases.galeracluster.com/mysql-wsrep-5.7.38-25.30/release-notes-mysql-wsrep-5.7.38-25.30.txt PR: 266004 --- databases/mysqlwsrep57-server/Makefile | 10 ++++----- databases/mysqlwsrep57-server/distinfo | 6 +++--- .../mysqlwsrep57-server/files/patch-sql_binlog.cc | 24 ---------------------- 3 files changed, 8 insertions(+), 32 deletions(-) diff --git a/databases/mysqlwsrep57-server/Makefile b/databases/mysqlwsrep57-server/Makefile index 433789d8f778..c58a56754dbf 100644 --- a/databases/mysqlwsrep57-server/Makefile +++ b/databases/mysqlwsrep57-server/Makefile @@ -1,8 +1,8 @@ PORTNAME= mysqlwsrep -PORTVERSION?= 5.7.35 -PORTREVISION= 1 +PORTVERSION?= 5.7.38 DISTVERSIONPREFIX?= wsrep_ -DISTVERSIONSUFFIX?= -25.27 +DISTVERSIONSUFFIX?= -25.30 +PORTREVISION= 0 CATEGORIES= databases MASTER_SITES+= SF/boost/boost/1.59.0:boost PKGNAMESUFFIX= 57-server @@ -84,8 +84,8 @@ PLIST_SUB= MY_DBDIR=${MY_DBDIR} \ MY_TMPDIR=${MY_TMPDIR} CONFLICTS_INSTALL= mariadb*-server \ - mysql*-server \ - mysqlwsrep*-server \ + mysql??-server \ + mysqlwsrep56-server \ percona*-server USE_RC_SUBR= mysql-server diff --git a/databases/mysqlwsrep57-server/distinfo b/databases/mysqlwsrep57-server/distinfo index c3db1c67a0a0..b466133fd0f6 100644 --- a/databases/mysqlwsrep57-server/distinfo +++ b/databases/mysqlwsrep57-server/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1636993366 +TIMESTAMP = 1660722832 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac SIZE (boost_1_59_0.tar.gz) = 83709983 -SHA256 (codership-mysql-wsrep-wsrep_5.7.35-25.27_GH0.tar.gz) = 1edd43a21eb413a1dc09431e5f85fa34c0ebcbeb11019fefb0396c4929bdd260 -SIZE (codership-mysql-wsrep-wsrep_5.7.35-25.27_GH0.tar.gz) = 56580667 +SHA256 (codership-mysql-wsrep-wsrep_5.7.38-25.30_GH0.tar.gz) = ccfa85642f186282821880e8719f982aa5111d02d76bb302ec52ff4ee854356a +SIZE (codership-mysql-wsrep-wsrep_5.7.38-25.30_GH0.tar.gz) = 56615589 SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0 SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032 diff --git a/databases/mysqlwsrep57-server/files/patch-sql_binlog.cc b/databases/mysqlwsrep57-server/files/patch-sql_binlog.cc deleted file mode 100644 index 5d99dc0814c2..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-sql_binlog.cc +++ /dev/null @@ -1,24 +0,0 @@ ---- sql/binlog.cc.orig 2021-06-16 10:56:53 UTC -+++ sql/binlog.cc -@@ -10149,8 +10149,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 -@@ -10221,8 +10221,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";