1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
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)
|
