From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 17 Sep 2014 00:29:19 +0000 (-0700)
Subject: Made QueryPage use startAtomic() for trx handling
X-Git-Tag: 1.31.0-rc.0~13940^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22messagerie%22%29%20.%20%22?a=commitdiff_plain;h=8abeaaf24a08a0e4ddc3cf62b060e42b612b21ba;p=lhc%2Fweb%2Fwiklou.git

Made QueryPage use startAtomic() for trx handling

Change-Id: I0a2e8e05c96dbc582ecc045876497737020f441a
---

diff --git a/includes/specialpage/QueryPage.php b/includes/specialpage/QueryPage.php
index ae0003dc18..c54dcc63df 100644
--- a/includes/specialpage/QueryPage.php
+++ b/includes/specialpage/QueryPage.php
@@ -324,7 +324,7 @@ abstract class QueryPage extends SpecialPage {
 							'qc_value' => $value );
 				}
 
-				$dbw->begin( __METHOD__ );
+				$dbw->startAtomic( __METHOD__ );
 				# Clear out any old cached data
 				$dbw->delete( 'querycache', array( 'qc_type' => $this->getName() ), $fname );
 				# Save results into the querycache table on the master
@@ -336,7 +336,7 @@ abstract class QueryPage extends SpecialPage {
 				$dbw->insert( 'querycache_info',
 					array( 'qci_type' => $this->getName(), 'qci_timestamp' => $dbw->timestamp() ),
 					$fname );
-				$dbw->commit( __METHOD__ );
+				$dbw->endAtomic( __METHOD__ );
 			}
 		} catch ( DBError $e ) {
 			if ( !$ignoreErrors ) {