From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 13 Jan 2016 14:44:08 +0000 (-0800)
Subject: Remove pointless rollback() warnings with "flush"
X-Git-Tag: 1.31.0-rc.0~8352
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dcompta/operations/supprimer.php?a=commitdiff_plain;h=f86bd0a7eb04730d1b6c9ae6f8f25c54d834f6ff;p=lhc%2Fweb%2Fwiklou.git

Remove pointless rollback() warnings with "flush"

This would previously make log noise when rollbackMasterChangesAndLog() runs

Change-Id: I36dd955a89b23ed6d1ea693cf5366c7d3ad8d3af
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 4684e437b2..6e1b8a9ad2 100644
--- 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 ) {