From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Mon, 21 Sep 2009 16:41:09 +0000 (+0000)
Subject: Merge r56715 from wmf-deployment (Moved unbuffered-ness to below count query to fix... 
X-Git-Tag: 1.31.0-rc.0~39592
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=5a3099339f81409140fd2760a55e0e6d18b7eb01;p=lhc%2Fweb%2Fwiklou.git

Merge r56715 from wmf-deployment (Moved unbuffered-ness to below count query to fix brokenness)
---

diff --git a/maintenance/cleanupTable.inc b/maintenance/cleanupTable.inc
index ef5bebdd7a..986a44e19d 100644
--- a/maintenance/cleanupTable.inc
+++ b/maintenance/cleanupTable.inc
@@ -88,13 +88,13 @@ abstract class TableCleanup extends Maintenance {
 	protected function runTable( $table, $where, $callback ) {
 		$dbw = wfGetDB( DB_MASTER );
 		
-		// Unbuffered queries, avoids OOM
-		$dbw->bufferResults( false );
-		
 		$count = $dbw->selectField( $table, 'count(*)', '', __METHOD__ );
 		$this->init( $count, $table );
 		$this->output( "Processing $table..." );
 
+		// Unbuffered queries, avoids OOM
+		$dbw->bufferResults( false );
+		
 		$tableName = $dbw->tableName( $table );
 		$sql = "SELECT * FROM $tableName $where";
 		$result = $dbw->query( $sql, __METHOD__ );