Fixing regression

Author: rennox

modules/mod_mysqlx_session.cc

@@ -152,16 +152,15 @@ Value BaseSession::connect(const Argument_list &args) {
     else
       ssl_mode = static_cast<int>(shcore::SslMode::Preferred);
 
+    if (_port == 0 && _sock.empty())
+      _port = 33060;
+
     _session.open(_host, _port, _schema, _user, _password, _ssl_info.ca,
       _ssl_info.cert, _ssl_info.key, _ssl_info.capath, _ssl_info.crl, _ssl_info.crlpath,
       _ssl_info.tls_version, _ssl_info.ciphers, ssl_mode, 60000, _auth_method, true);
 
     _connection_id = _session.get_connection_id();
 
-    // TODO(rennox): Implement is_tcp() for X protocol
-    if (_port == 0 && _sock.empty())
-      _port = 33060;
-
     set_uri();
 
     _default_schema = _schema;

shell-qa-test/xshell_automated.py

@@ -8572,6 +8572,7 @@ def test_MYS_560(self):
         results = exec_xshell_commands(init_command, x_cmds)
         self.assertEqual(results, 'PASS')
 
+    @unittest.skip("This bugfix has not been completed in 1.0")
     def test_MYS_583(self):
         '''[MYS-583]: https://clustra.no.oracle.com/orabugs/bug.php?id=26422790
       URI parsing does not decode PCT before passing to other systems'''