From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 26 Mar 2019 22:02:10 +0000 (+0000)
Subject: Merge "rdbms: treat cloned temporary tables as "effective write" targets"
X-Git-Tag: 1.34.0-rc.0~2332
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22calendrier%22%2C%22type=semaine%22%29%20.%20%22?a=commitdiff_plain;h=1a62e51a00321eb6674e27cdff57c683703a5579;p=lhc%2Fweb%2Fwiklou.git

Merge "rdbms: treat cloned temporary tables as "effective write" targets"
---

1a62e51a00321eb6674e27cdff57c683703a5579
diff --cc includes/libs/rdbms/database/DBConnRef.php
index 70b05835c1,5421b28a19..cf582b7e99
--- a/includes/libs/rdbms/database/DBConnRef.php
+++ b/includes/libs/rdbms/database/DBConnRef.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() );
  	}