Fixed bug #31818110 - Legacy (JDBC) Connector/C++ cannot connect to a non-default port other than 3306

Author: Bogdan Degtyariov

driver/mysql_connection.cpp

@@ -600,6 +600,23 @@ void MySQL_Connection::init(ConnectOptionsMap & properties)
   bool secure_auth= true;
 #endif
 
+  /* Port from options must be set as default for all hosts where port
+     is not specified */
+  {
+    sql::ConnectOptionsMap::const_iterator it = properties.find("port");
+    if (it != properties.end())	{
+      try {
+        p_i = (it->second).get< int >();
+      } catch (sql::InvalidArgumentException&) {
+        throw sql::InvalidArgumentException("Wrong type passed for port expected int");
+      }
+      if (p_i) {
+        uri.setDefaultPort(*p_i);
+      } else {
+        throw sql::InvalidArgumentException("No long long value passed for port");
+      }
+    }
+  }
 
   /* Values set in properties individually should have priority over those
      we restore from Uri */

driver/mysql_uri.cpp

@@ -166,7 +166,7 @@ bool parseUri(const sql::SQLString & str, MySQL_Uri& uri)
     size_t sep = 0;
 
     std::string name;
-    unsigned int port = DEFAULT_TCP_PORT;
+    unsigned int port = uri.DefaultPort();
 
     if (hostname[0] == MYURI_HOST_BEGIN)
     {