From b30f86cd14da78b24ae3e59253c89b0fad8585d1 Mon Sep 17 00:00:00 2001
From: Sam Reed <reedy@users.mediawiki.org>
Date: Mon, 11 Apr 2011 18:46:35 +0000
Subject: [PATCH] Revert r85785

---
 RELEASE-NOTES                   | 1 -
 includes/Article.php            | 9 +--------
 includes/filerepo/LocalFile.php | 9 +--------
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8d8784731b..1f537f860f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -238,7 +238,6 @@ PHP if you have not done so prior to upgrading MediaWiki.
 * (bug 28485) Block::purgeExpired Database returned error "1205: Lock wait timeout
   exceeded;"
 * (bug 27639) Transaction timeout when trying to OldLocalFile::upgradeRow()
-* (bug 13921) deadlocks mass-deleting media files in categories
 
  === API changes in 1.18 ===
 * (bug 26339) Throw warning when truncating an overlarge API result
diff --git a/includes/Article.php b/includes/Article.php
index e70b7b85b8..a52b613356 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -4420,11 +4420,7 @@ class Article {
 	 */
 	public function updateCategoryCounts( $added, $deleted ) {
 		$ns = $this->mTitle->getNamespace();
-
-		// https://bugzilla.wikimedia.org/show_bug.cgi?id=13921
-		// Create and use a new loadBalancer object, to prevent "1205: Lock wait timeout exceeded;"
-		$lb = wfGetLBFactory()->newMainLB();
-		$dbw = $lb->getConnection( DB_MASTER );
+		$dbw = wfGetDB( DB_MASTER );
 
 		# First make sure the rows exist.  If one of the "deleted" ones didn't
 		# exist, we might legitimately not create it, but it's simpler to just
@@ -4476,9 +4472,6 @@ class Article {
 				__METHOD__
 			);
 		}
-
-		$lb->commitMasterChanges();
-		$lb->closeAll();
 	}
 
 	/**
diff --git a/includes/filerepo/LocalFile.php b/includes/filerepo/LocalFile.php
index de4f75819c..1f9184a6fe 100644
--- a/includes/filerepo/LocalFile.php
+++ b/includes/filerepo/LocalFile.php
@@ -1508,13 +1508,9 @@ class LocalFileDeleteBatch {
 	}
 
 	function doDBDeletes() {
+		$dbw = $this->file->repo->getMasterDB();
 		list( $oldRels, $deleteCurrent ) = $this->getOldRels();
 
-		// https://bugzilla.wikimedia.org/show_bug.cgi?id=13921
-		// Create and use a new loadBalancer object, to prevent "1205: Lock wait timeout exceeded;"
-		$lb = wfGetLBFactory()->newMainLB();
-		$dbw = $lb->getConnection( DB_MASTER );
-
 		if ( count( $oldRels ) ) {
 			$dbw->delete( 'oldimage',
 				array(
@@ -1526,9 +1522,6 @@ class LocalFileDeleteBatch {
 		if ( $deleteCurrent ) {
 			$dbw->delete( 'image', array( 'img_name' => $this->file->getName() ), __METHOD__ );
 		}
-
-		$lb->commitMasterChanges();
-		$lb->closeAll();
 	}
 
 	/**
-- 
2.20.1