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
@@ -1,15 +1,32 @@
 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)
      google::protobuf::io::CodedInputStream stream(reinterpret_cast<const uint8_t*>(request.buffer()),
                                                    static_cast<int>(request.buffer_size()));
      // variable 'mysqlx_max_allowed_packet' has been checked when buffer was filling by data
 -    stream.SetTotalBytesLimit(static_cast<int>(request.buffer_size()), -1 /*no warnings*/);
 +    stream.SetTotalBytesLimit(static_cast<int>(request.buffer_size()));
      // Protobuf limits the number of nested objects when decoding messages
      // lets set the value in explicit way (to ensure that is set accordingly with
      // out stack size)