r114285 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r114284‎ | r114285 | r114286 >
Date:17:29, 20 March 2012
Author:aaron
Status:ok
Tags:
Comment:
Modified paths:
  • /branches/wmf/1.19wmf1 (modified) (history)
  • /branches/wmf/1.19wmf1/includes (modified) (history)
  • /branches/wmf/1.19wmf1/includes/filerepo/file/LocalFile.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.19wmf1/includes/filerepo/file/LocalFile.php
@@ -1408,7 +1408,8 @@
14091409 $this->locked++;
14101410 }
14111411
1412 - return $dbw->selectField( 'image', '1', array( 'img_name' => $this->getName() ), __METHOD__ );
 1412+ return $dbw->selectField( 'image', '1',
 1413+ array( 'img_name' => $this->getName() ), __METHOD__, array( 'FOR UPDATE' ) );
14131414 }
14141415
14151416 /**
Property changes on: branches/wmf/1.19wmf1/includes
___________________________________________________________________
Modified: svn:mergeinfo
14161417 Merged /trunk/phase3/includes:r114228
Property changes on: branches/wmf/1.19wmf1
___________________________________________________________________
Modified: svn:mergeinfo
14171418 Merged /trunk/phase3:r114228

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r114228[FileRepo] Added long-since missing FOR UPDATE to LocalFile::lock(). This mig...aaron00:57, 20 March 2012

Status & tagging log