Merge "rdbms: treat cloned temporary tables as "effective write" targets"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 26 Mar 2019 22:02:10 +0000 (22:02 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 26 Mar 2019 22:02:10 +0000 (22:02 +0000)
1  2 
includes/libs/rdbms/database/DBConnRef.php
includes/libs/rdbms/database/DatabaseMysqlBase.php
includes/libs/rdbms/database/DatabasePostgres.php
tests/phpunit/includes/db/DatabaseSqliteTest.php

@@@ -251,10 -235,10 +251,10 @@@ class DBConnRef implements IDatabase 
        }
  
        public function close() {
 -              return $this->__call( __FUNCTION__, func_get_args() );
 +              throw new DBUnexpectedError( $this->conn, 'Cannot close shared connection.' );
        }
  
-       public function query( $sql, $fname = __METHOD__, $tempIgnore = false ) {
+       public function query( $sql, $fname = __METHOD__, $flags = 0 ) {
                return $this->__call( __FUNCTION__, func_get_args() );
        }