dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2187613
108fd8b
)
Merge "rdbms: treat cloned temporary tables as "effective write" targets"
author
jenkins-bot
<jenkins-bot@gerrit.wikimedia.org>
Tue, 26 Mar 2019 22:02:10 +0000
(22:02 +0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Tue, 26 Mar 2019 22:02:10 +0000
(22:02 +0000)
1
2
includes/libs/rdbms/database/DBConnRef.php
patch
|
diff1
|
diff2
|
blob
|
history
includes/libs/rdbms/database/DatabaseMysqlBase.php
patch
|
diff1
|
diff2
|
blob
|
history
includes/libs/rdbms/database/DatabasePostgres.php
patch
|
diff1
|
diff2
|
blob
|
history
tests/phpunit/includes/db/DatabaseSqliteTest.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
includes/libs/rdbms/database/DBConnRef.php
index
70b0583
,
5421b28
..
cf582b7
---
1
/
includes/libs/rdbms/database/DBConnRef.php
---
2
/
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() );
}
diff --cc
includes/libs/rdbms/database/DatabaseMysqlBase.php
Simple merge
diff --cc
includes/libs/rdbms/database/DatabasePostgres.php
Simple merge
diff --cc
tests/phpunit/includes/db/DatabaseSqliteTest.php
Simple merge