From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 17 Sep 2014 00:20:23 +0000 (-0700)
Subject: Made the DB profiler use startAtomic()
X-Git-Tag: 1.31.0-rc.0~13989^2
X-Git-Url: http://git.cyclocoop.org//%22%22.str_replace%28%27%22%27%2C?a=commitdiff_plain;h=cbb1c5fcefdc6078c92ec040d4addfee70a1bc07;p=lhc%2Fweb%2Fwiklou.git

Made the DB profiler use startAtomic()

Change-Id: I6eadd071c16781b320d0c8c518e6184a4c38d874
---

diff --git a/includes/profiler/ProfilerSimpleDB.php b/includes/profiler/ProfilerSimpleDB.php
index 38a6436f9d..7ef0ad05c5 100644
--- a/includes/profiler/ProfilerSimpleDB.php
+++ b/includes/profiler/ProfilerSimpleDB.php
@@ -58,7 +58,7 @@ class ProfilerSimpleDB extends ProfilerStandard {
 			$dbw = wfGetDB( DB_MASTER );
 			$useTrx = ( $dbw->getType() === 'sqlite' ); // much faster
 			if ( $useTrx ) {
-				$dbw->begin();
+				$dbw->startAtomic( __METHOD__ );
 			}
 			foreach ( $this->mCollated as $name => $data ) {
 				$eventCount = $data['count'];
@@ -103,7 +103,7 @@ class ProfilerSimpleDB extends ProfilerStandard {
 				//     "pf_time=pf_time + VALUES(pf_time)";
 			}
 			if ( $useTrx ) {
-				$dbw->commit();
+				$dbw->endAtomic( __METHOD__ );
 			}
 		} catch ( DBError $e ) {
 		}