dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7792993
)
Fixed deadlockLoop() IDE errors
author
Aaron Schulz
<aschulz@wikimedia.org>
Thu, 6 Aug 2015 19:45:30 +0000
(12:45 -0700)
committer
Aaron Schulz
<aschulz@wikimedia.org>
Thu, 6 Aug 2015 19:45:30 +0000
(12:45 -0700)
Change-Id: I76bb9250bc8017756af4f2552cd48ab595a26297
includes/db/Database.php
patch
|
blob
|
history
diff --git
a/includes/db/Database.php
b/includes/db/Database.php
index
2ee4545
..
cf0eab7
100644
(file)
--- a/
includes/db/Database.php
+++ b/
includes/db/Database.php
@@
-3205,7
+3205,8
@@
abstract class DatabaseBase implements IDatabase {
* iteration, or false on error, for example if the retry limit was
* reached.
*
- * @return bool
+ * @return mixed
+ * @throws DBQueryError
*/
public function deadlockLoop() {
$args = func_get_args();
@@
-3219,6
+3220,7
@@
abstract class DatabaseBase implements IDatabase {
$this->begin( __METHOD__ );
+ $retVal = null;
$e = null;
do {
try {