From: Platonides <platonides@users.mediawiki.org>
Date: Sun, 30 May 2010 20:13:06 +0000 (+0000)
Subject: Remove r44003 workaround. It is no longer needed, we can now use temporary tables... 
X-Git-Tag: 1.31.0-rc.0~36653
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=297b7a0daae0f68681dcd9be826907ae31092e7b;p=lhc%2Fweb%2Fwiklou.git

Remove r44003 workaround. It is no longer needed, we can now use temporary tables again.
---

diff --git a/maintenance/parserTests.inc b/maintenance/parserTests.inc
index 0144998881..b76ee5e6f9 100644
--- a/maintenance/parserTests.inc
+++ b/maintenance/parserTests.inc
@@ -637,10 +637,12 @@ class ParserTest {
 		$this->databaseSetupDone = true;
 		$this->oldTablePrefix = $wgDBprefix;
 
+		# SqlBagOStuff broke when using temporary tables on r40209 (bug 15892).
+		# It seems to have been fixed since (r55079?).
+		# If it fails, $wgCaches[CACHE_DB] = new HashBagOStuff(); should work around it.
+
 		# CREATE TEMPORARY TABLE breaks if there is more than one server
-		# FIXME: r40209 makes temporary tables break even with just one server
-		# FIXME: (bug 15892); disabling the feature entirely as a temporary fix
-		if ( true || wfGetLB()->getServerCount() != 1 ) {
+		if ( wfGetLB()->getServerCount() != 1 ) {
 			$this->useTemporaryTables = false;
 		}