git: 76e3cae42986 - main - databases/mysql57-server: Fix build with protobuf 3.20.0+

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Sat, 16 Apr 2022 04:25:05 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=76e3cae429868de40817b2d5b9efa7aac2973be3

commit 76e3cae429868de40817b2d5b9efa7aac2973be3
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-04-16 04:14:52 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-04-16 04:19:49 +0000

    databases/mysql57-server: Fix build with protobuf 3.20.0+
---
 databases/mysql57-server/files/patch-protobuf | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/databases/mysql57-server/files/patch-protobuf b/databases/mysql57-server/files/patch-protobuf
index 3c1a23fdd859..4326fdb49df2 100644
--- a/databases/mysql57-server/files/patch-protobuf
+++ b/databases/mysql57-server/files/patch-protobuf
@@ -2,6 +2,23 @@ Deprecated 2-parameter SetTotalBytesLimit() has be removed since protobuf 3.18.0
 
 Reference:	https://github.com/protocolbuffers/protobuf/commit/cda795437d00a15f375d3d5e2659adac715459c6
 
+--- rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc.orig	2021-11-29 20:09:43 UTC
++++ rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc
+@@ -629,12 +629,12 @@ class ErrorDumper : public ::google::protobuf::io::Err
+   std::stringstream m_out;
+ 
+ public:
+-  virtual void AddError(int line, int column, const string & message)
++  virtual void AddError(int line, int column, const std::string & message)
+   {
+     m_out << "ERROR in message: line " << line+1 << ": column " << column << ": " << message<<"\n";
+   }
+ 
+-  virtual void AddWarning(int line, int column, const string & message)
++  virtual void AddWarning(int line, int column, const std::string & message)
+   {
+     m_out << "WARNING in message: line " << line+1 << ": column " << column << ": " << message<<"\n";
+   }
 --- rapid/plugin/x/ngs/src/protocol_decoder.cc.orig	2021-11-29 20:09:43 UTC
 +++ rapid/plugin/x/ngs/src/protocol_decoder.cc
 @@ -123,7 +123,7 @@ Error_code Message_decoder::parse(Request &request)