From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 24 Dec 2015 01:11:24 +0000 (-0800)
Subject: Upgrade mismatched commit() warnings to exceptions
X-Git-Tag: 1.31.0-rc.0~7965
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22upgrade%22%2C%22reinstall=non%22%29%20.%20%22?a=commitdiff_plain;h=ef44f4308edbcd97d6e53d211716fa2dfa143c26;p=lhc%2Fweb%2Fwiklou.git

Upgrade mismatched commit() warnings to exceptions

I saw no WMF logs for these in the last 7 days.

Change-Id: I725535925ba3fc68cee485767f18937fb8f239bf
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index bd1e3753e6..ef4a7b74a2 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -2654,7 +2654,10 @@ abstract class DatabaseBase implements IDatabase {
 			if ( !$this->mTrxLevel ) {
 				return; // nothing to do
 			} elseif ( !$this->mTrxAutomatic ) {
-				wfWarn( "$fname: Flushing an explicit transaction, getting out of sync!" );
+				throw new DBUnexpectedError(
+					$this,
+					"$fname: Flushing an explicit transaction, getting out of sync!"
+				);
 			}
 		} else {
 			if ( !$this->mTrxLevel ) {