From 5a3099339f81409140fd2760a55e0e6d18b7eb01 Mon Sep 17 00:00:00 2001 From: Andrew Garrett Date: Mon, 21 Sep 2009 16:41:09 +0000 Subject: [PATCH] Merge r56715 from wmf-deployment (Moved unbuffered-ness to below count query to fix brokenness) --- maintenance/cleanupTable.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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__ ); -- 2.20.1