[packages/percona-server] - added fixes for protobuf 3.20

qboosh qboosh at pld-linux.org
Mon Sep 23 21:22:50 CEST 2024


commit f9d73d7e5c26ed067f816d3fc46623c63fd08535
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Sep 23 21:25:51 2024 +0200

    - added fixes for protobuf 3.20

 mysql-protobuf.patch | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
---
diff --git a/mysql-protobuf.patch b/mysql-protobuf.patch
index cce64d4..c231a9b 100644
--- a/mysql-protobuf.patch
+++ b/mysql-protobuf.patch
@@ -10,3 +10,31 @@
  #include <google/protobuf/dynamic_message.h>
  
  #include "mysqlx_connection.pb.h"
+--- percona-server-5.7.44-48/rapid/plugin/x/ngs/src/protocol_decoder.cc.orig	2023-11-30 19:53:18.000000000 +0100
++++ percona-server-5.7.44-48/rapid/plugin/x/ngs/src/protocol_decoder.cc	2024-09-23 06:16:10.330576008 +0200
+@@ -123,7 +123,7 @@ Error_code Message_decoder::parse(Reques
+     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)
+--- percona-server-5.7.44-48/rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc.orig	2023-11-30 19:53:18.000000000 +0100
++++ percona-server-5.7.44-48/rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc	2024-09-23 06:24:17.203438495 +0200
+@@ -629,12 +629,12 @@ class ErrorDumper : public ::google::pro
+   std::stringstream m_out;
+ 
+ public:
+-  virtual void AddError(int line, int column, const string & message)
++  virtual void AddError(int line, google::protobuf::io::ColumnNumber 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, google::protobuf::io::ColumnNumber column, const std::string & message)
+   {
+     m_out << "WARNING in message: line " << line+1 << ": column " << column << ": " << message<<"\n";
+   }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/percona-server.git/commitdiff/f9d73d7e5c26ed067f816d3fc46623c63fd08535



More information about the pld-cvs-commit mailing list