From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 13 Jan 2016 15:00:42 +0000 (-0800)
Subject: Remove pointless rollback() warnings with "flush"
X-Git-Tag: 1.31.0-rc.0~8351
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=commitdiff_plain;h=0599bd94ebd9b875da3236e88bcf48a25db343e9;p=lhc%2Fweb%2Fwiklou.git

Remove pointless rollback() warnings with "flush"

This would previously make log noise when rollbackMasterChangesAndLog()
is triggered for explicit transactions.

Change-Id: Ia0009bcf575ef346d3bb7354ce3fb6fb477eb95f
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 6e1b8a9ad2..c58e9bdea8 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -2689,8 +2689,6 @@ abstract class DatabaseBase implements IDatabase {
 		} else {
 			if ( !$this->mTrxLevel ) {
 				return; // nothing to do
-			} elseif ( !$this->mTrxAutomatic ) {
-				wfWarn( "$fname: Flushing an explicit transaction, getting out of sync!" );
 			}
 		}