From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 6 Nov 2015 00:23:21 +0000 (-0800)
Subject: Improve mismatched atomic section errors
X-Git-Tag: 1.31.0-rc.0~9084
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=commitdiff_plain;h=33a3e097cb196241f7d702c248531a7f134f4a0d;p=lhc%2Fweb%2Fwiklou.git

Improve mismatched atomic section errors

Change-Id: I9b1561b6426ac00f72867452bee396b649ad8bfd
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 531086b363..60cf0ecef0 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -3438,7 +3438,7 @@ abstract class DatabaseBase implements IDatabase {
 				$levels = implode( ', ', $this->mTrxAtomicLevels );
 				throw new DBUnexpectedError(
 					$this,
-					"Got explicit BEGIN while atomic sections $levels are still open."
+					"Got explicit BEGIN from $fname while atomic section(s) $levels are open."
 				);
 			} elseif ( !$this->mTrxAutomatic ) {
 				// We want to warn about inadvertently nested begin/commit pairs, but not about