From 129737caafa2bc42c1c1ad2e20d57404047ada77 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Thu, 4 May 2023 11:13:17 +0000 Subject: [PATCH 1/2] fix old compiler issue --- lib/MySQL_HostGroups_Manager.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/MySQL_HostGroups_Manager.cpp b/lib/MySQL_HostGroups_Manager.cpp index c7e0d5ab1..f7bfc75ee 100644 --- a/lib/MySQL_HostGroups_Manager.cpp +++ b/lib/MySQL_HostGroups_Manager.cpp @@ -1879,7 +1879,9 @@ void MySQL_HostGroups_Manager::update_hostgroup_manager_mappings() { if (itr == hostgroup_server_mapping.end()) { std::unique_ptr server_mapping(new HostGroup_Server_Mapping(this)); fetched_server_mapping = server_mapping.get(); - hostgroup_server_mapping.insert({ server_id, std::move(server_mapping) }); + hostgroup_server_mapping.insert( std::pair> { + server_id, std::move(server_mapping) + } ); } else { fetched_server_mapping = itr->second.get(); } From 9a5a9ac66e35861d5833190996a0dc15659dfec0 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Thu, 4 May 2023 11:13:46 +0000 Subject: [PATCH 2/2] fix clang issue --- lib/ProxySQL_Cluster.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ProxySQL_Cluster.cpp b/lib/ProxySQL_Cluster.cpp index ff4471618..996655cee 100644 --- a/lib/ProxySQL_Cluster.cpp +++ b/lib/ProxySQL_Cluster.cpp @@ -930,8 +930,8 @@ void ProxySQL_Node_Entry::set_checksums(MYSQL_RES *_r) { proxy_info("Cluster: Fetch mysql_servers_v2:'YES', mysql_servers:'%s' from peer %s:%d\n", (fetch_runtime ? "YES" : "NO"), hostname, port); - GloProxyCluster->pull_mysql_servers_v2_from_peer({ v->checksum, v->epoch }, - { runtime_mysql_server_checksum->checksum, runtime_mysql_server_checksum->epoch }, fetch_runtime); + GloProxyCluster->pull_mysql_servers_v2_from_peer({ v->checksum, static_cast(v->epoch) }, + { runtime_mysql_server_checksum->checksum, static_cast(runtime_mysql_server_checksum->epoch) }, fetch_runtime); runtime_mysql_servers_already_loaded = fetch_runtime; } @@ -967,7 +967,7 @@ void ProxySQL_Node_Entry::set_checksums(MYSQL_RES *_r) { if (v->diff_check >= diff_ms) { proxy_debug(PROXY_DEBUG_CLUSTER, 5, "Detected peer %s:%d with mysql_servers version %llu, epoch %llu, diff_check %u. Own version: %llu, epoch: %llu. Proceeding with remote sync\n", hostname, port, v->version, v->epoch, v->diff_check, own_version, own_epoch); proxy_info("Cluster: detected a peer %s:%d with mysql_servers version %llu, epoch %llu, diff_check %u. Own version: %llu, epoch: %llu. Proceeding with remote sync\n", hostname, port, v->version, v->epoch, v->diff_check, own_version, own_epoch); - GloProxyCluster->pull_runtime_mysql_servers_from_peer({ v->checksum, v->epoch }); + GloProxyCluster->pull_runtime_mysql_servers_from_peer({ v->checksum, static_cast(v->epoch) }); } } if ((v->epoch == own_epoch) && v->diff_check && ((v->diff_check % (diff_ms * 10)) == 0)) {