Merge "rdbms: make LoadBalancer::doWait() cast $timeout to an integer"

diff --combined includes/libs/rdbms/loadbalancer/LoadBalancer.php
index e2d3b33,96b6180..96ea949
--- 1/includes/libs/rdbms/loadbalancer/LoadBalancer.php
--- 2/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@@ -575,6 -575,7 +575,6 @@@ class LoadBalancer implements ILoadBala
                        if ( !empty( $connsByServer[$i] ) ) {
                                /** @var IDatabase[] $serverConns */
                                $serverConns = $connsByServer[$i];
 -
                                return reset( $serverConns );
                        }
                }
@@@ -590,7 -591,7 +590,7 @@@
         * @return bool
         */
        protected function doWait( $index, $open = false, $timeout = null ) {
-               $timeout = max( 1, $timeout ?: $this->waitTimeout );
+               $timeout = max( 1, intval( $timeout ?: $this->waitTimeout ) );
  
                // Check if we already know that the DB has reached this point
                $server = $this->getServerName( $index );
@@@ -688,7 -689,7 +688,7 @@@
                        $domain = false; // local connection requested
                }
  
 -              if ( ( $flags & self::CONN_TRX_AUTO ) === self::CONN_TRX_AUTO ) {
 +              if ( ( $flags & self::CONN_TRX_AUTOCOMMIT ) === self::CONN_TRX_AUTOCOMMIT ) {
                        // Assuming all servers are of the same type (or similar), which is overwhelmingly
                        // the case, use the master server information to get the attributes. The information
                        // for $i cannot be used since it might be DB_REPLICA, which might require connection
@@@ -699,9 -700,8 +699,9 @@@
                                // rows (e.g. FOR UPDATE) or (b) make small commits during a larger transactions
                                // to reduce lock contention. None of these apply for sqlite and using separate
                                // connections just causes self-deadlocks.
 -                              $flags &= ~self::CONN_TRX_AUTO;
 -                              $this->connLogger->info( __METHOD__ . ': ignoring CONN_TRX_AUTO to avoid deadlocks.' );
 +                              $flags &= ~self::CONN_TRX_AUTOCOMMIT;
 +                              $this->connLogger->info( __METHOD__ .
 +                                      ': ignoring CONN_TRX_AUTOCOMMIT to avoid deadlocks.' );
                        }
                }
  
@@@ -714,7 -714,7 +714,7 @@@
  
                if ( $i == self::DB_MASTER ) {
                        $i = $this->getWriterIndex();
 -              } else {
 +              } elseif ( $i == self::DB_REPLICA ) {
                        # Try to find an available server in any the query groups (in order)
                        foreach ( $groups as $group ) {
                                $groupIndex = $this->getReaderIndex( $group, $domain );
@@@ -859,7 -859,7 +859,7 @@@
                // main set of DB connections but rather its own pool since:
                // a) those are usually set to implicitly use transaction rounds via DBO_TRX
                // b) those must support the use of explicit transaction rounds via beginMasterChanges()
 -              $autoCommit = ( ( $flags & self::CONN_TRX_AUTO ) == self::CONN_TRX_AUTO );
 +              $autoCommit = ( ( $flags & self::CONN_TRX_AUTOCOMMIT ) == self::CONN_TRX_AUTOCOMMIT );
  
                if ( $domain !== false ) {
                        // Connection is to a foreign domain
@@@ -937,7 -937,7 +937,7 @@@
                $domainInstance = DatabaseDomain::newFromId( $domain );
                $dbName = $domainInstance->getDatabase();
                $prefix = $domainInstance->getTablePrefix();
 -              $autoCommit = ( ( $flags & self::CONN_TRX_AUTO ) == self::CONN_TRX_AUTO );
 +              $autoCommit = ( ( $flags & self::CONN_TRX_AUTOCOMMIT ) == self::CONN_TRX_AUTOCOMMIT );
  
                if ( $autoCommit ) {
                        $connFreeKey = self::KEY_FOREIGN_FREE_NOROUND;
@@@ -1220,7 -1220,7 +1220,7 @@@
        }
  
        public function closeConnection( IDatabase $conn ) {
 -              $serverIndex = $conn->getLBInfo( 'serverIndex' ); // second index level of mConns
 +              $serverIndex = $conn->getLBInfo( 'serverIndex' );
                foreach ( $this->conns as $type => $connsByServer ) {
                        if ( !isset( $connsByServer[$serverIndex] ) ) {
                                continue;