From: Reedy <reedy@wikimedia.org>
Date: Fri, 6 Jul 2012 16:57:40 +0000 (+0100)
Subject: Use estimateRowPage if wiki is using wgMiserMode
X-Git-Tag: 1.31.0-rc.0~23117
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=a8cdc7df3a8cb8323719102cd266bbfccdbe0458;p=lhc%2Fweb%2Fwiklou.git

Use estimateRowPage if wiki is using wgMiserMode

Change-Id: I59404e9514a87f65faf3eb865fafe358d9f01079
---

diff --git a/maintenance/updateCollation.php b/maintenance/updateCollation.php
index 6160a3054b..fd425fe7b7 100644
--- a/maintenance/updateCollation.php
+++ b/maintenance/updateCollation.php
@@ -79,13 +79,19 @@ TEXT;
 					$collationConds,
 					__METHOD__
 				);
-
-				if ( $count == 0 ) {
-					$this->output( "Collations up-to-date.\n" );
-					return;
-				}
-				$this->output( "Fixing collation for $count rows.\n" );
+			} else {
+				$count = $dbw->estimateRowCount(
+					'categorylinks',
+					'',
+					$collationConds,
+					__METHOD__
+				);
+			}
+			if ( $count == 0 ) {
+				$this->output( "Collations up-to-date.\n" );
+				return;
 			}
+			$this->output( "Fixing collation for $count rows.\n" );
 		}
 
 		$count = 0;