pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/databases/mysql80-cluster
Module Name: pkgsrc
Committed By: jnemeth
Date: Wed Oct 22 07:21:48 UTC 2025
Modified Files:
pkgsrc/databases/mysql80-cluster: Makefile Makefile.common distinfo
Added Files:
pkgsrc/databases/mysql80-cluster/patches:
patch-plugin_x_client_xprotocol__impl.cc
patch-plugin_x_protocol_plugin_encoder__file__output.h
patch-plugin_x_protocol_plugin_message__field__chain.cc
patch-plugin_x_protocol_plugin_messages__used__by__server.cc
patch-plugin_x_protocol_stream_decompression__input__stream.h
patch-plugin_x_src_io_vio__input__stream.h
patch-plugin_x_src_prepare__param__handler.cc
patch-plugin_x_tests_driver_connector_session__holder.cc
patch-plugin_x_tests_driver_formatters_message__formatter.cc
patch-plugin_x_tests_driver_processor_send__message__block__processor.cc
patch-unittest_gunit_xplugin_xpl_message__helpers.h
Log Message:
Build fix based on joerg@'s mysql80-server patches. Also, a couple
of pkglint fixes while here.
No PKGREVISION bump as it didn't work before.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/mysql80-cluster/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/mysql80-cluster/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/mysql80-cluster/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_client_xprotocol__impl.cc \
pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_protocol_plugin_encoder__file__output.h \
pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_protocol_plugin_message__field__chain.cc \
pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_protocol_plugin_messages__used__by__server.cc \
pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_protocol_stream_decompression__input__stream.h \
pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_src_io_vio__input__stream.h \
pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_src_prepare__param__handler.cc \
pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_tests_driver_connector_session__holder.cc \
pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_tests_driver_formatters_message__formatter.cc \
pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_tests_driver_processor_send__message__block__processor.cc \
pkgsrc/databases/mysql80-cluster/patches/patch-unittest_gunit_xplugin_xpl_message__helpers.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/databases/mysql80-cluster/Makefile
diff -u pkgsrc/databases/mysql80-cluster/Makefile:1.10 pkgsrc/databases/mysql80-cluster/Makefile:1.11
--- pkgsrc/databases/mysql80-cluster/Makefile:1.10 Sun Aug 24 16:36:15 2025
+++ pkgsrc/databases/mysql80-cluster/Makefile Wed Oct 22 07:21:48 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2025/08/24 16:36:15 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2025/10/22 07:21:48 jnemeth Exp $
PKGNAME= ${DISTNAME:S/-gpl//}
PKGREVISION= 9
@@ -95,6 +95,8 @@ REPLACE_SH+= mysql-test/t/long_tmpdir-m
REPLACE_SH+= mysql-test/t/lowercase_mixed_tmpdir-master.sh
REPLACE_SH+= mysql-test/t/lowercase_mixed_tmpdir_innodb-master.sh
+CHECK_WRKREF_SKIP= share/doc/mysql/INFO_BIN
+
pre-build:
${RM} -f ${WRKSRC}/storage/ndb/mcc/frontend/dojo/dojox/mobile/build/build.sh.orig
Index: pkgsrc/databases/mysql80-cluster/Makefile.common
diff -u pkgsrc/databases/mysql80-cluster/Makefile.common:1.4 pkgsrc/databases/mysql80-cluster/Makefile.common:1.5
--- pkgsrc/databases/mysql80-cluster/Makefile.common:1.4 Tue May 6 09:38:26 2025
+++ pkgsrc/databases/mysql80-cluster/Makefile.common Wed Oct 22 07:21:48 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2025/05/06 09:38:26 wiz Exp $
+# $NetBSD: Makefile.common,v 1.5 2025/10/22 07:21:48 jnemeth Exp $
#
# used by databases/mysql-cluster/Makefile
@@ -15,7 +15,8 @@ MAINTAINER?= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://www.mysql.com/products/cluster/
LICENSE= gnu-gpl-v2
-USE_CMAKE= yes
+.include "../../devel/cmake/build.mk"
+
USE_LANGUAGES= c c++03
USE_CXX_FEATURES= c++14
USE_TOOLS+= bash gmake perl:run python:run bison
@@ -101,8 +102,8 @@ CXXFLAGS+= -fPIC -DPIC
# and does not properly detect this, breaking the build later on. Also
# explicitly disable epoll support as it is Linux-specific.
CMAKE_CONFIGURE_ARGS.SunOS+= -DHAVE_SYS_EPOLL_H=NO -DHAVE_EPOLL_CREATE=NO
-CFLAGS.SunOS+= -DHAVE_CURSES_H
-CXXFLAGS.SunOS+= -DHAVE_CURSES_H
+CFLAGS.SunOS+= -DHAVE_CURSES_H
+CXXFLAGS.SunOS+= -DHAVE_CURSES_H
.include "../../mk/pthread.buildlink3.mk"
Index: pkgsrc/databases/mysql80-cluster/distinfo
diff -u pkgsrc/databases/mysql80-cluster/distinfo:1.2 pkgsrc/databases/mysql80-cluster/distinfo:1.3
--- pkgsrc/databases/mysql80-cluster/distinfo:1.2 Mon May 5 22:22:11 2025
+++ pkgsrc/databases/mysql80-cluster/distinfo Wed Oct 22 07:21:48 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2025/05/05 22:22:11 wiz Exp $
+$NetBSD: distinfo,v 1.3 2025/10/22 07:21:48 jnemeth Exp $
BLAKE2s (boost_1_77_0.tar.bz2) = 11f9651d7078e67a69a97f46dce3131af1f1b3ba5976c26435cd17a66161cbf1
SHA512 (boost_1_77_0.tar.bz2) = 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f
@@ -20,6 +20,16 @@ SHA1 (patch-mysys_kqueue__timers.cc) = d
SHA1 (patch-mysys_stacktrace.cc) = ab0f4ee576b49e179805656dc7f1a43f5c4f16a8
SHA1 (patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__vp__platform.h) = 7b815f7e4f40842dc73b3c0fca22aa03035e836e
SHA1 (patch-plugin_x_CMakeLists.txt) = 26237c28ff35eed1fe6770c0574397f2dfc03538
+SHA1 (patch-plugin_x_client_xprotocol__impl.cc) = 8ef07459c774a4746fd4762c7721d20815d0cb1b
+SHA1 (patch-plugin_x_protocol_plugin_encoder__file__output.h) = 9af907442d460a6d2651fbe9c0c1c8e6155db94f
+SHA1 (patch-plugin_x_protocol_plugin_message__field__chain.cc) = 34729f2ac6683b373453fee3d0de17b8c1daae03
+SHA1 (patch-plugin_x_protocol_plugin_messages__used__by__server.cc) = d148ff33b2b02de56510c73eba925926a948318f
+SHA1 (patch-plugin_x_protocol_stream_decompression__input__stream.h) = 13bd96e0e5cd8c024fa282dacb31201e7d20622a
+SHA1 (patch-plugin_x_src_io_vio__input__stream.h) = 32d921053c50dada1499e07d7a055bc3b25c39b7
+SHA1 (patch-plugin_x_src_prepare__param__handler.cc) = 5d8a68519a4a566779645963fc2a6fe0f387c351
+SHA1 (patch-plugin_x_tests_driver_connector_session__holder.cc) = ce594f0fdacc4501e0e0c78a0b2a2dfbc1051eac
+SHA1 (patch-plugin_x_tests_driver_formatters_message__formatter.cc) = 12db7029d2e47c4d6ffb16175a96af0ab03e8fef
+SHA1 (patch-plugin_x_tests_driver_processor_send__message__block__processor.cc) = 6b9bcbd9cf88f9f7498fba5e22c1d31589743d40
SHA1 (patch-router_CMakeLists.txt) = da430f15797e07ce108be03dae5d4042e851ca1c
SHA1 (patch-router_src_harness_include_mysql_harness_net__ts_impl_netif.h) = ec77bf0d80a7b574462cc9249b7c5d1054c33384
SHA1 (patch-router_src_harness_include_mysql_harness_net__ts_internet.h) = 96576ff19bce9b5c308337015075b31fef836d72
@@ -35,4 +45,5 @@ SHA1 (patch-sql_resourcegroups_platform_
SHA1 (patch-storage_innobase_include_detail_ut_large__page__alloc-linux.h) = 195469587bfc24bc71ffc6814ccbd973170a3946
SHA1 (patch-storage_ndb_src_common_portlib_NdbHW.cpp) = 6ac23cfd535fa2cf14703cca84a865f93d574263
SHA1 (patch-storage_ndb_src_ndbapi_NdbEventOperationImpl.cpp) = f254045b12424fed85bfe7d9dc4989c04bf78092
+SHA1 (patch-unittest_gunit_xplugin_xpl_message__helpers.h) = d3fae40c740f27760e07852ab30d5c26c0759cbe
SHA1 (patch-vio_viosocket.cc) = 6aab7e41f0a34a212c91a61ffe1eb2e74090745e
Added files:
Index: pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_client_xprotocol__impl.cc
diff -u /dev/null pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_client_xprotocol__impl.cc:1.1
--- /dev/null Wed Oct 22 07:21:49 2025
+++ pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_client_xprotocol__impl.cc Wed Oct 22 07:21:48 2025
@@ -0,0 +1,39 @@
+$NetBSD: patch-plugin_x_client_xprotocol__impl.cc,v 1.1 2025/10/22 07:21:48 jnemeth Exp $
+
+--- plugin/x/client/xprotocol_impl.cc.orig 2025-10-20 03:17:06.101903558 +0000
++++ plugin/x/client/xprotocol_impl.cc
+@@ -32,6 +32,7 @@
+ #include <iostream>
+ #include <limits>
+ #include <string>
++#include <string_view>
+
+ #include "errmsg.h" // NOLINT(build/include_subdir)
+ #include "my_config.h" // NOLINT(build/include_subdir)
+@@ -782,7 +783,7 @@ std::unique_ptr<XProtocol::Message> Prot
+ DBUG_LOG("debug", "Deserialize message: " << ret_val->GetTypeName());
+ if (!ret_val->ParseFromCodedStream(input_stream)) {
+ std::string error_message(ERR_MSG_MESSAGE_NOT_INITIALIZED);
+- error_message += "Name:" + ret_val->GetTypeName() + ", ";
++ error_message += "Name:" + std::string(ret_val->GetTypeName()) + ", ";
+ error_message += ret_val->InitializationErrorString();
+ *out_error = XError(CR_MALFORMED_PACKET, error_message);
+
+@@ -816,7 +817,7 @@ std::unique_ptr<XProtocol::Message> Prot
+
+ if (!ret_val->IsInitialized()) {
+ std::string err(ERR_MSG_MESSAGE_NOT_INITIALIZED);
+- err += "Name:" + ret_val->GetTypeName() + ", ";
++ err += "Name:" + std::string(ret_val->GetTypeName()) + ", ";
+ err += ret_val->InitializationErrorString();
+ *out_error = XError(CR_MALFORMED_PACKET, err);
+
+@@ -1122,7 +1123,7 @@ XProtocol::Message *Protocol_impl::recv_
+
+ if (!m_compressed.ParseFromCodedStream(&cis)) {
+ std::string error_message(ERR_MSG_MESSAGE_NOT_INITIALIZED);
+- error_message += "Name:" + m_compressed.GetTypeName() + ", ";
++ error_message += "Name:" + std::string(m_compressed.GetTypeName()) + ", ";
+ error_message += m_compressed.InitializationErrorString();
+ *out_error = XError(CR_MALFORMED_PACKET, error_message);
+ return nullptr;
Index: pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_protocol_plugin_encoder__file__output.h
diff -u /dev/null pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_protocol_plugin_encoder__file__output.h:1.1
--- /dev/null Wed Oct 22 07:21:49 2025
+++ pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_protocol_plugin_encoder__file__output.h Wed Oct 22 07:21:48 2025
@@ -0,0 +1,39 @@
+$NetBSD: patch-plugin_x_protocol_plugin_encoder__file__output.h,v 1.1 2025/10/22 07:21:48 jnemeth Exp $
+
+--- plugin/x/protocol/plugin/encoder_file_output.h.orig 2025-10-20 03:22:47.313593092 +0000
++++ plugin/x/protocol/plugin/encoder_file_output.h
+@@ -30,6 +30,7 @@
+ #include <cstring>
+ #include <set>
+ #include <string>
++#include <string_view>
+ #include <vector>
+
+ #include "my_compiler.h"
+@@ -79,7 +80,7 @@ class Encoder_file_output : public File_
+ return;
+
+ write_to_context(context, "");
+- write_to_context(context, "struct ", message->name(), " {");
++ write_to_context(context, "struct ", std::string(message->name()), " {");
+
+ if (message->options().HasExtension(Mysqlx::server_message_id)) {
+ const auto server_id_numeric = static_cast<int>(
+@@ -97,7 +98,7 @@ class Encoder_file_output : public File_
+ bool is_reserved = false;
+ const auto field = message->field(i);
+ const auto field_tag = std::to_string(field->number());
+- const auto field_name = get_cpp_field_name(field->name(), &is_reserved);
++ const auto field_name = get_cpp_field_name(std::string(field->name()), &is_reserved);
+
+ if (is_reserved) {
+ write_to_context(context,
+@@ -129,7 +130,7 @@ class Encoder_file_output : public File_
+
+ // Check if we there is a message containing Server message ID
+ if (0 == m_used_message_ids.count(enum_value->number())) {
+- std::string value = " " + enum_value->name() + " = " +
++ std::string value = std::string(" ") + std::string(enum_value->name()) + " = " +
+ std::to_string(enum_value->number());
+
+ values.push_back(value);
Index: pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_protocol_plugin_message__field__chain.cc
diff -u /dev/null pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_protocol_plugin_message__field__chain.cc:1.1
--- /dev/null Wed Oct 22 07:21:49 2025
+++ pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_protocol_plugin_message__field__chain.cc Wed Oct 22 07:21:48 2025
@@ -0,0 +1,30 @@
+$NetBSD: patch-plugin_x_protocol_plugin_message__field__chain.cc,v 1.1 2025/10/22 07:21:48 jnemeth Exp $
+
+--- plugin/x/protocol/plugin/message_field_chain.cc.orig 2024-07-13 15:30:43.000000000 +0000
++++ plugin/x/protocol/plugin/message_field_chain.cc
+@@ -26,6 +26,7 @@
+ #include "plugin/x/protocol/plugin/message_field_chain.h"
+
+ #include <string>
++#include <string_view>
+
+ #include "my_compiler.h"
+ MY_COMPILER_DIAGNOSTIC_PUSH()
+@@ -58,7 +59,7 @@ bool Message_field_chain::begin_validate
+
+ // Check against cycles in Message dependencies graph
+ const bool was_node_visited =
+- message && 0 != m_types_done.count(message->full_name());
++ message && 0 != m_types_done.count(std::string(message->full_name()));
+
+ if (nullptr == message || was_node_visited || 0 == message->field_count()) {
+ m_output_file->append_chain(m_context, chain);
+@@ -74,7 +75,7 @@ bool Message_field_chain::begin_validate
+
+ void Message_field_chain::end_validate_field(const FieldDescriptor *field,
+ const Descriptor *message) {
+- m_types_done.erase(message->full_name());
++ m_types_done.erase(std::string(message->full_name()));
+ const auto position = m_chain.find_last_of(".");
+
+ if (std::string::npos != position) m_chain.resize(position);
Index: pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_protocol_plugin_messages__used__by__server.cc
diff -u /dev/null pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_protocol_plugin_messages__used__by__server.cc:1.1
--- /dev/null Wed Oct 22 07:21:49 2025
+++ pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_protocol_plugin_messages__used__by__server.cc Wed Oct 22 07:21:48 2025
@@ -0,0 +1,29 @@
+$NetBSD: patch-plugin_x_protocol_plugin_messages__used__by__server.cc,v 1.1 2025/10/22 07:21:48 jnemeth Exp $
+
+--- plugin/x/protocol/plugin/messages_used_by_server.cc.orig 2024-07-13 15:30:43.000000000 +0000
++++ plugin/x/protocol/plugin/messages_used_by_server.cc
+@@ -26,6 +26,7 @@
+ #include "plugin/x/protocol/plugin/messages_used_by_server.h"
+
+ #include <string>
++#include <string_view>
+
+ #include "my_compiler.h"
+ MY_COMPILER_DIAGNOSTIC_PUSH()
+@@ -49,14 +50,14 @@ bool Messages_used_by_server::begin_vali
+ const auto &message_options = message->options();
+
+ if (!message_options.HasExtension(Mysqlx::server_message_id)) {
+- if (0 == m_forced_packages.count(message->file()->package()))
++ if (0 == m_forced_packages.count(std::string(message->file()->package())))
+ return false;
+ }
+ }
+
+ // Check against cycles in Message dependencies graph
+ const bool was_node_visited =
+- message && 0 != m_types_done.count(message->full_name());
++ message && 0 != m_types_done.count(std::string(message->full_name()));
+
+ if (nullptr == message || was_node_visited) {
+ return false;
Index: pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_protocol_stream_decompression__input__stream.h
diff -u /dev/null pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_protocol_stream_decompression__input__stream.h:1.1
--- /dev/null Wed Oct 22 07:21:49 2025
+++ pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_protocol_stream_decompression__input__stream.h Wed Oct 22 07:21:48 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-plugin_x_protocol_stream_decompression__input__stream.h,v 1.1 2025/10/22 07:21:48 jnemeth Exp $
+
+--- plugin/x/protocol/stream/decompression_input_stream.h.orig 2024-07-13 15:30:43.000000000 +0000
++++ plugin/x/protocol/stream/decompression_input_stream.h
+@@ -93,7 +93,7 @@ class Decompression_input_stream
+ return Skip(count - left);
+ }
+
+- google::protobuf::int64 ByteCount() const override {
++ int64_t ByteCount() const override {
+ return m_all + m_output_buffer_offset;
+ }
+
Index: pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_src_io_vio__input__stream.h
diff -u /dev/null pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_src_io_vio__input__stream.h:1.1
--- /dev/null Wed Oct 22 07:21:49 2025
+++ pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_src_io_vio__input__stream.h Wed Oct 22 07:21:48 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-plugin_x_src_io_vio__input__stream.h,v 1.1 2025/10/22 07:21:48 jnemeth Exp $
+
+--- plugin/x/src/io/vio_input_stream.h.orig 2024-07-13 15:30:43.000000000 +0000
++++ plugin/x/src/io/vio_input_stream.h
+@@ -36,7 +36,7 @@ namespace xpl {
+
+ class Vio_input_stream : public google::protobuf::io::ZeroCopyInputStream {
+ public:
+- using gint64 = google::protobuf::int64;
++ using gint64 = int64_t;
+
+ public:
+ explicit Vio_input_stream(const std::shared_ptr<iface::Vio> &connection);
Index: pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_src_prepare__param__handler.cc
diff -u /dev/null pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_src_prepare__param__handler.cc:1.1
--- /dev/null Wed Oct 22 07:21:49 2025
+++ pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_src_prepare__param__handler.cc Wed Oct 22 07:21:48 2025
@@ -0,0 +1,23 @@
+$NetBSD: patch-plugin_x_src_prepare__param__handler.cc,v 1.1 2025/10/22 07:21:48 jnemeth Exp $
+
+--- plugin/x/src/prepare_param_handler.cc.orig 2025-10-20 03:36:31.577775897 +0000
++++ plugin/x/src/prepare_param_handler.cc
+@@ -28,6 +28,7 @@
+ #include <my_byteorder.h>
+
+ #include <string>
++#include <string_view>
+
+ #include "plugin/x/src/ngs/mysqlx/getter_any.h"
+ #include "plugin/x/src/xpl_error.h"
+@@ -147,8 +148,8 @@ ngs::Error_code Prepare_param_handler::p
+ "' and of type '%s' is not supported for binding"
+ " to prepared statement",
+ ph.m_id,
+- arg.has_scalar() ? arg.scalar().GetTypeName().c_str()
+- : arg.GetTypeName().c_str());
++ arg.has_scalar() ? std::string(arg.scalar().GetTypeName()).c_str()
++ : std::string(arg.GetTypeName()).c_str());
+ }
+ }
+ return ngs::Success();
Index: pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_tests_driver_connector_session__holder.cc
diff -u /dev/null pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_tests_driver_connector_session__holder.cc:1.1
--- /dev/null Wed Oct 22 07:21:49 2025
+++ pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_tests_driver_connector_session__holder.cc Wed Oct 22 07:21:48 2025
@@ -0,0 +1,30 @@
+$NetBSD: patch-plugin_x_tests_driver_connector_session__holder.cc,v 1.1 2025/10/22 07:21:48 jnemeth Exp $
+
+--- plugin/x/tests/driver/connector/session_holder.cc.orig 2025-10-20 03:43:37.105949620 +0000
++++ plugin/x/tests/driver/connector/session_holder.cc
+@@ -358,7 +358,7 @@ xcl::Handler_result Session_holder::coun
+ Mysqlx::ServerMessages::descriptor()->full_name();
+ const bool is_empty_message = (protobuf_message_name == server_message_name);
+ const std::string &msg_name = !is_empty_message
+- ? msg.GetDescriptor()->full_name()
++ ? std::string(msg.GetDescriptor()->full_name())
+ : server_msgs_by_id[msg_id].second;
+
+ ++m_received_msg_counters[msg_name];
+@@ -367,11 +367,11 @@ xcl::Handler_result Session_holder::coun
+ return xcl::Handler_result::Continue;
+
+ static const std::array<std::string, 5> k_notice_type_id = {
+- Mysqlx::Notice::Warning::descriptor()->full_name(),
+- Mysqlx::Notice::SessionVariableChanged::descriptor()->full_name(),
+- Mysqlx::Notice::SessionStateChanged::descriptor()->full_name(),
+- Mysqlx::Notice::GroupReplicationStateChanged::descriptor()->full_name(),
+- Mysqlx::Notice::ServerHello::descriptor()->full_name(),
++ std::string(Mysqlx::Notice::Warning::descriptor()->full_name()),
++ std::string(Mysqlx::Notice::SessionVariableChanged::descriptor()->full_name()),
++ std::string(Mysqlx::Notice::SessionStateChanged::descriptor()->full_name()),
++ std::string(Mysqlx::Notice::GroupReplicationStateChanged::descriptor()->full_name()),
++ std::string(Mysqlx::Notice::ServerHello::descriptor()->full_name()),
+ };
+
+ const auto notice_type =
Index: pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_tests_driver_formatters_message__formatter.cc
diff -u /dev/null pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_tests_driver_formatters_message__formatter.cc:1.1
--- /dev/null Wed Oct 22 07:21:49 2025
+++ pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_tests_driver_formatters_message__formatter.cc Wed Oct 22 07:21:48 2025
@@ -0,0 +1,58 @@
+$NetBSD: patch-plugin_x_tests_driver_formatters_message__formatter.cc,v 1.1 2025/10/22 07:21:48 jnemeth Exp $
+
+--- plugin/x/tests/driver/formatters/message_formatter.cc.orig 2025-10-20 03:52:56.220471475 +0000
++++ plugin/x/tests/driver/formatters/message_formatter.cc
+@@ -176,7 +176,7 @@ static std::string message_to_text(const
+ message.ParseFromString(binary_message);
+ google::protobuf::TextFormat::PrintToString(message, &result);
+
+- return message.GetDescriptor()->full_name() + " { " + result + " }";
++ return std::string(message.GetDescriptor()->full_name()) + " { " + result + " }";
+ }
+
+ static std::string messages_field_to_text(const Message &message,
+@@ -206,7 +206,7 @@ static std::string messages_field_to_tex
+ return xpl::to_string(reflection->GetBool(message, fd));
+
+ case FieldDescriptor::CPPTYPE_ENUM:
+- return reflection->GetEnum(message, fd)->name();
++ return std::string(reflection->GetEnum(message, fd)->name());
+
+ case FieldDescriptor::CPPTYPE_STRING:
+ return reflection->GetString(message, fd);
+@@ -247,7 +247,7 @@ static std::string messages_repeated_fie
+ return xpl::to_string(reflection->GetRepeatedBool(message, fd, index));
+
+ case FieldDescriptor::CPPTYPE_ENUM:
+- return reflection->GetRepeatedEnum(message, fd, index)->name();
++ return std::string(reflection->GetRepeatedEnum(message, fd, index)->name());
+
+ case FieldDescriptor::CPPTYPE_STRING:
+ return reflection->GetRepeatedString(message, fd, index);
+@@ -313,7 +313,7 @@ std::string message_to_text(const Messag
+ printer.PrintToString(message, &output);
+ }
+
+- return message.GetDescriptor()->full_name() + " {\n" + output + "}\n";
++ return std::string(message.GetDescriptor()->full_name()) + " {\n" + output + "}\n";
+ }
+
+ /**
+@@ -348,7 +348,7 @@ std::string message_to_text(const Messag
+ std::find_if(output.begin(), output.end(), expected_field);
+
+ if (output.end() == i) {
+- throw std::logic_error("Message '" + msg->GetDescriptor()->full_name() +
++ throw std::logic_error("Message '" + std::string(msg->GetDescriptor()->full_name()) +
+ "' doesn't contains field '" +
+ expected_field.m_name +
+ "'"
+@@ -405,7 +405,7 @@ std::string message_to_text(const Messag
+ std::string prefix = "";
+
+ if (show_message_name)
+- prefix = message.GetDescriptor()->full_name() + "(" + field_path + ") = ";
++ prefix = std::string(message.GetDescriptor()->full_name()) + "(" + field_path + ") = ";
+
+ if (!field_descriptor->is_repeated())
+ return prefix + messages_field_to_text(*msg, field_descriptor);
Index: pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_tests_driver_processor_send__message__block__processor.cc
diff -u /dev/null pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_tests_driver_processor_send__message__block__processor.cc:1.1
--- /dev/null Wed Oct 22 07:21:49 2025
+++ pkgsrc/databases/mysql80-cluster/patches/patch-plugin_x_tests_driver_processor_send__message__block__processor.cc Wed Oct 22 07:21:48 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-plugin_x_tests_driver_processor_send__message__block__processor.cc,v 1.1 2025/10/22 07:21:48 jnemeth Exp $
+
+--- plugin/x/tests/driver/processor/send_message_block_processor.cc.orig 2025-10-20 04:09:59.450725036 +0000
++++ plugin/x/tests/driver/processor/send_message_block_processor.cc
+@@ -160,7 +160,7 @@ std::string Send_message_block_processor
+ #endif
+
+ res[4] = client_msgs_by_name
+- [client_msgs_by_full_name[message.GetDescriptor()->full_name()]]
++ [client_msgs_by_full_name[std::string(message.GetDescriptor()->full_name())]]
+ .second;
+ res.append(out);
+
Index: pkgsrc/databases/mysql80-cluster/patches/patch-unittest_gunit_xplugin_xpl_message__helpers.h
diff -u /dev/null pkgsrc/databases/mysql80-cluster/patches/patch-unittest_gunit_xplugin_xpl_message__helpers.h:1.1
--- /dev/null Wed Oct 22 07:21:49 2025
+++ pkgsrc/databases/mysql80-cluster/patches/patch-unittest_gunit_xplugin_xpl_message__helpers.h Wed Oct 22 07:21:48 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-unittest_gunit_xplugin_xpl_message__helpers.h,v 1.1 2025/10/22 07:21:48 jnemeth Exp $
+
+--- unittest/gunit/xplugin/xpl/message_helpers.h.orig 2025-10-20 07:14:16.269228877 +0000
++++ unittest/gunit/xplugin/xpl/message_helpers.h
+@@ -39,9 +39,9 @@ inline std::string msg_to_string(const n
+ printer.SetSingleLineMode(true);
+ std::string output;
+ printer.PrintToString(msg, &output);
+- return msg.GetTypeName() + "{ " + output + "}";
++ return std::string(msg.GetTypeName()) + "{ " + output + "}";
+ #else
+- return msg.GetTypeName();
++ return std::string(msg.GetTypeName());
+ #endif
+ }
+
Home |
Main Index |
Thread Index |
Old Index