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:
95ebc3d
)
Remove pointless rollback() warnings with "flush"
author
Aaron Schulz
<aschulz@wikimedia.org>
Wed, 13 Jan 2016 14:44:08 +0000
(06:44 -0800)
committer
Aaron Schulz
<aschulz@wikimedia.org>
Wed, 13 Jan 2016 14:44:08 +0000
(06:44 -0800)
This would previously make log noise when rollbackMasterChangesAndLog() runs
Change-Id: I36dd955a89b23ed6d1ea693cf5366c7d3ad8d3af
includes/db/Database.php
patch
|
blob
|
history
diff --git
a/includes/db/Database.php
b/includes/db/Database.php
index
4684e43
..
6e1b8a9
100644
(file)
--- a/
includes/db/Database.php
+++ b/
includes/db/Database.php
@@
-2685,8
+2685,6
@@
abstract class DatabaseBase implements IDatabase {
if ( !$this->mTrxLevel ) {
wfWarn( "$fname: No transaction to rollback, something got out of sync!" );
return; // nothing to do
- } elseif ( $this->mTrxAutomatic ) {
- wfWarn( "$fname: Explicit rollback of implicit transaction. Something may be out of sync!" );
}
} else {
if ( !$this->mTrxLevel ) {