From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 2 Oct 2013 17:37:06 +0000 (-0700)
Subject: Removed more FORCE INDEX clauses for logging
X-Git-Tag: 1.31.0-rc.0~18621^2
X-Git-Url: http://git.cyclocoop.org/wiki/Target_page?a=commitdiff_plain;h=ab19523309713e00204b216f3f342edcdd7640ca;p=lhc%2Fweb%2Fwiklou.git

Removed more FORCE INDEX clauses for logging

* Same reasons as 7003a7c5e825f391c1a83f8e46cdf332a228d874

bug: 54876
Change-Id: I743bd21e81395c2866b4241730caa8c5990cc73f
---

diff --git a/includes/logging/LogPager.php b/includes/logging/LogPager.php
index f8403ca826..09ae3b8ce9 100644
--- a/includes/logging/LogPager.php
+++ b/includes/logging/LogPager.php
@@ -249,13 +249,6 @@ class LogPager extends ReverseChronologicalPager {
 				# no duplicate log rows. Otherwise, we need to remove the duplicates.
 				$options[] = 'DISTINCT';
 			}
-		# Avoid usage of the wrong index by limiting
-		# the choices of available indexes. This mainly
-		# avoids site-breaking filesorts.
-		} elseif ( $this->title || $this->pattern || $this->performer ) {
-			$index['logging'] = array( 'page_time', 'user_time', 'log_user_type_time' );
-		} elseif ( count( $this->types ) == 1 ) {
-			$index['logging'] = 'type_time'; // @TODO: sucks for change tags
 		}
 		if ( count( $index ) ) {
 			$options['USE INDEX'] = $index;