ENGCOM-5445: Fix Adapter\Pdo\Mysql::closeConnection on non-default ports #23428

Author: sidolov

lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php

@@ -571,14 +571,6 @@ protected function _query($sql, $bind = [])
                     $triesCount++;
                     $this->closeConnection();
 
-                    /**
-                     * _connect() function does not allow port parameter, so put the port back with the host
-                     */
-                    if (!empty($this->_config['port'])) {
-                        $this->_config['host'] = implode(':', [$this->_config['host'], $this->_config['port']]);
-                        unset($this->_config['port']);
-                    }
-
                     $this->_connect();
                 }
 
@@ -4034,4 +4026,19 @@ public function getSchemaListener()
         }
         return $this->schemaListener;
     }
+
+    /**
+     * Closes the connection.
+     */
+    public function closeConnection()
+    {
+        /**
+         * _connect() function does not allow port parameter, so put the port back with the host
+         */
+        if (!empty($this->_config['port'])) {
+            $this->_config['host'] = implode(':', [$this->_config['host'], $this->_config['port']]);
+            unset($this->_config['port']);
+        }
+        parent::closeConnection();
+    }
 }