git: 40a7e69af6ca - main - databases/mysqlwsrep57-server: Update to 5.7.38-25.30

The branch main has been updated by nc:

URL: https://cgit.FreeBSD.org/ports/commit/?id=40a7e69af6cae46067fefbea74d7cd900e6bc24f

commit 40a7e69af6cae46067fefbea74d7cd900e6bc24f
Author:     No Name <devel@galeracluster.com>
AuthorDate: 2022-08-25 17:33:20 +0000
Commit:     Neel Chauhan <nc@FreeBSD.org>
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";