git: 25cc11b8173a - main - databases/mysql57-*: update to 5.7.36

The branch main has been updated by joneum:

URL: https://cgit.FreeBSD.org/ports/commit/?id=25cc11b8173a833283e319174f9555c0b9b2fce3

commit 25cc11b8173a833283e319174f9555c0b9b2fce3
Author:     Jochen Neumeister <joneum@FreeBSD.org>
AuthorDate: 2021-11-01 17:07:26 +0000
Commit:     Jochen Neumeister <joneum@FreeBSD.org>
CommitDate: 2021-11-01 17:09:03 +0000

    databases/mysql57-*: update to 5.7.36
    
    Full Changelog: https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-36.html
    
    Sponsored by:   Netzkommune GmbH
---
 databases/mysql57-client/Makefile                  |  2 +-
 databases/mysql57-server/Makefile                  |  2 +-
 databases/mysql57-server/distinfo                  |  6 +++---
 databases/mysql57-server/files/patch-sql_binlog.cc | 24 ----------------------
 4 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile
index 0e64409255a9..39417203cabd 100644
--- a/databases/mysql57-client/Makefile
+++ b/databases/mysql57-client/Makefile
@@ -1,7 +1,7 @@
 # Created by: "Mahdi Mokhtari <mokhi64@gmail.com>"
 
 PORTNAME=	mysql
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	57-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index 1e8f93fdffa9..1832a940eead 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -1,7 +1,7 @@
 # Created by: Mahdi Mokhtari <mokhi64@gmail.com>
 
 PORTNAME?=	mysql
-PORTVERSION=	5.7.35
+PORTVERSION=	5.7.36
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	MYSQL/MySQL-5.7
diff --git a/databases/mysql57-server/distinfo b/databases/mysql57-server/distinfo
index 16aa72c286a0..2556a51b56d1 100644
--- a/databases/mysql57-server/distinfo
+++ b/databases/mysql57-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627053937
-SHA256 (mysql-boost-5.7.35.tar.gz) = 6b30c93e5927857e31769bf5356eb23a5cff59c0a0205e5772b51b09bf3f9e12
-SIZE (mysql-boost-5.7.35.tar.gz) = 52959014
+TIMESTAMP = 1635184799
+SHA256 (mysql-boost-5.7.36.tar.gz) = 99efd49b9bfe44d0ecebedce3db075c5f0e9d4b6fc08cfe0a42b86418e5f06da
+SIZE (mysql-boost-5.7.36.tar.gz) = 52968383
diff --git a/databases/mysql57-server/files/patch-sql_binlog.cc b/databases/mysql57-server/files/patch-sql_binlog.cc
deleted file mode 100644
index 7367bc283603..000000000000
--- a/databases/mysql57-server/files/patch-sql_binlog.cc
+++ /dev/null
@@ -1,24 +0,0 @@
---- sql/binlog.cc.orig	2021-03-26 06:58:52 UTC
-+++ sql/binlog.cc
-@@ -9973,8 +9973,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
-@@ -10045,8 +10045,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";