From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 26 Feb 2015 21:13:36 +0000 (-0800)
Subject: Made insertMessageBlob use (start|end)Atomic in case DBO_TRX is off
X-Git-Tag: 1.31.0-rc.0~12222
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=80a3a30d6a90b21f68cca4dfe5b3623cb9e5e7fc;p=lhc%2Fweb%2Fwiklou.git

Made insertMessageBlob use (start|end)Atomic in case DBO_TRX is off

Change-Id: I6b730e8b4a6cb2d4a82a0cf471c7625ccfd08a0e
---

diff --git a/includes/MessageBlobStore.php b/includes/MessageBlobStore.php
index c3841882bf..8de9cc9e0b 100644
--- a/includes/MessageBlobStore.php
+++ b/includes/MessageBlobStore.php
@@ -93,6 +93,7 @@ class MessageBlobStore {
 
 		try {
 			$dbw = wfGetDB( DB_MASTER );
+			$dbw->startAtomic( __METHOD__ );
 			$success = $dbw->insert( 'msg_resource', array(
 					'mr_lang' => $lang,
 					'mr_resource' => $name,
@@ -127,6 +128,7 @@ class MessageBlobStore {
 					);
 				}
 			}
+			$dbw->endAtomic( __METHOD__ );
 		} catch ( DBError $e ) {
 			wfDebug( __METHOD__ . " failed to update DB: $e\n" );
 		}