From d109eae77f904501e2b0d25b2713feab7313b1ad Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Wed, 18 Jan 2012 12:10:16 +0000
Subject: [PATCH] Pass some more __METHOD__ to DatabaseBase::begin() and
 DatabaseBase::commit()

---
 includes/DeferredUpdates.php | 2 +-
 includes/SiteStats.php       | 4 ++--
 includes/db/Database.php     | 4 ++--
 includes/db/LoadBalancer.php | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/includes/DeferredUpdates.php b/includes/DeferredUpdates.php
index f4e318d4da..262994e380 100644
--- a/includes/DeferredUpdates.php
+++ b/includes/DeferredUpdates.php
@@ -70,7 +70,7 @@ class DeferredUpdates {
 			$update->doUpdate();
 
 			if ( $doCommit && $dbw->trxLevel() ) {
-				$dbw->commit();
+				$dbw->commit( __METHOD__ );
 			}
 		}
 
diff --git a/includes/SiteStats.php b/includes/SiteStats.php
index 4dc62dac55..90e04c0ae6 100644
--- a/includes/SiteStats.php
+++ b/includes/SiteStats.php
@@ -268,9 +268,9 @@ class SiteStatsUpdate implements DeferrableUpdate {
 			$sql = "UPDATE $site_stats SET $updates";
 
 			# Need a separate transaction because this a global lock
-			$dbw->begin();
+			$dbw->begin( __METHOD__ );
 			$dbw->query( $sql, __METHOD__ );
-			$dbw->commit();
+			$dbw->commit( __METHOD__ );
 		}
 	}
 
diff --git a/includes/db/Database.php b/includes/db/Database.php
index e0b63e11f9..5ac0c2420b 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -836,7 +836,7 @@ abstract class DatabaseBase implements DatabaseType {
 			# is really used by application
 			$sqlstart = substr( $sql, 0, 10 ); // very much worth it, benchmark certified(tm)
 			if ( strpos( $sqlstart, "SHOW " ) !== 0 && strpos( $sqlstart, "SET " ) !== 0 )
-				$this->begin();
+				$this->begin( __METHOD__ . " ($fname)" );
 		}
 
 		if ( $this->debug() ) {
@@ -2742,7 +2742,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 */
 	function deadlockLoop() {
 
-		$this->begin();
+		$this->begin( __METHOD__ );
 		$args = func_get_args();
 		$function = array_shift( $args );
 		$oldIgnore = $this->ignoreErrors( true );
diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 55ce599ba7..e96c6720ea 100644
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -912,7 +912,7 @@ class LoadBalancer {
 			}
 			foreach ( $conns2[$masterIndex] as $conn ) {
 				if ( $conn->doneWrites() ) {
-					$conn->commit();
+					$conn->commit( __METHOD__ );
 				}
 			}
 		}
-- 
2.20.1