From: Sam Reed <reedy@users.mediawiki.org>
Date: Sat, 25 Jun 2011 16:30:32 +0000 (+0000)
Subject: Hack followup to r90643
X-Git-Tag: 1.31.0-rc.0~29284
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=ef34cb719216c68eaa1079897b3f3be182fa31f5;p=lhc%2Fweb%2Fwiklou.git

Hack followup to r90643

Comment out the call SHOW SLAVE STATUS for getting replag, leaving the use processlist

Not sure when Tim/someone else will look at it, so easier to just hack the bad code for the moment, so people can develop/test etc
---

diff --git a/includes/db/DatabaseMysql.php b/includes/db/DatabaseMysql.php
index 90d2dc9f06..d5e8d19f6b 100644
--- a/includes/db/DatabaseMysql.php
+++ b/includes/db/DatabaseMysql.php
@@ -365,9 +365,9 @@ class DatabaseMysql extends DatabaseBase {
 			return $this->mFakeSlaveLag;
 		}
 
-		if ( version_compare( $this->getServerVersion(), '4.1.9', '>=' ) ) {
+		/*if ( version_compare( $this->getServerVersion(), '4.1.9', '>=' ) ) {
 			return $this->getLagFromSlaveStatus();
-		} else {
+		} else */{
 			return $this->getLagFromProcesslist();
 		}
 	}