Define MYSQL_PROXY_PORT

aws · Apr 25, 2023 · ab93160 · ab93160
1 parent 4974e59
commit ab93160
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/driver/failover_handler.cc b/driver/failover_handler.cc
@@ -68,6 +68,8 @@ const std::regex IPV6_COMPRESSED_PATTERN(
     R"#(^(([0-9A-Fa-f]{1,4}(:[0-9A-Fa-f]{1,4}){0,5})?)::(([0-9A-Fa-f]{1,4}(:[0-9A-Fa-f]{1,4}){0,5})?)$)#");
 
 const char* MYSQL_READONLY_QUERY = "SELECT @@innodb_read_only AS is_reader";
+
+const unsigned int MYSQL_PROXY_PORT = 8666;
 }  // namespace
 
 FAILOVER_HANDLER::FAILOVER_HANDLER(DBC* dbc, DataSource* ds)
@@ -362,9 +364,9 @@ bool FAILOVER_HANDLER::should_connect_to_new_writer(const char* host) {
     ds_set_wstrnattr(&ds->server, (SQLWCHAR*)writer_host_wstr.c_str(), writer_host_wstr.size());
     ds_set_strnattr(&ds->server8, (SQLCHAR*)writer_host.c_str(), writer_host.size());
 
-    std::string suffix = ".proxied";
-    if (writer_host.compare(writer_host.length() - suffix.length(), suffix.length(), suffix) == 0) {
-        ds->port = 8666;
+    // If we are updating to a proxied server, we need to also update the port to the proxy port.
+    if (writer_host.compare(writer_host.length() - 8, 8, ".proxied") == 0) {
+        ds->port = MYSQL_PROXY_PORT;
     }
 
     return true;