Merge "Make MySQLi work with non-standard port"

diff --combined includes/db/DatabaseMysqli.php
index 635909c,0dc1890..b371ae0
--- 1/includes/db/DatabaseMysqli.php
--- 2/includes/db/DatabaseMysqli.php
+++ b/includes/db/DatabaseMysqli.php
@@@ -57,6 -57,17 +57,17 @@@ class DatabaseMysqli extends DatabaseMy
                                . " have you compiled PHP with the --with-mysqli option?\n" );
                }
  
+               // Other than mysql_connect, mysqli_real_connect expects an explicit port
+               // parameter. So we need to parse the port out of $realServer
+               $port = null;
+               $hostAndPort = IP::splitHostAndPort( $realServer );
+               if ( $hostAndPort ) {
+                       $realServer = $hostAndPort[0];
+                       if ( $hostAndPort[1] ) {
+                               $port = $hostAndPort[1];
+                       }
+               }
+               
                $connFlags = 0;
                if ( $this->mFlags & DBO_SSL ) {
                        $connFlags |= MYSQLI_CLIENT_SSL;
@@@ -83,7 -94,7 +94,7 @@@
                                usleep( 1000 );
                        }
                        if ( $mysqli->real_connect( $realServer, $this->mUser,
-                               $this->mPassword, $this->mDBname, null, null, $connFlags )
+                               $this->mPassword, $this->mDBname, $port, null, $connFlags )
                        ) {
                                return $mysqli;
                        }
@@@ -244,7 -255,6 +255,7 @@@
         */
        protected function mysqlFieldType( $res, $n ) {
                $field = $res->fetch_field_direct( $n );
 +
                return $field->type;
        }
  
@@@ -281,18 -291,4 +292,18 @@@
        protected function mysqlPing() {
                return $this->mConn->ping();
        }
 +
 +      /**
 +       * Give an id for the connection
 +       *
 +       * mysql driver used resource id, but mysqli objects cannot be cast to string.
 +       */
 +      public function __toString() {
 +              if ( $this->mConn instanceof Mysqli ) {
 +                      return (string)$this->mConn->thread_id;
 +              } else {
 +                      // mConn might be false or something.
 +                      return (string)$this->mConn;
 +              }
 +      }
  }