From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 8 Apr 2011 23:06:56 +0000 (+0000)
Subject: Quick fix for bug 15892: intermittent SQL-based cache failures during parser test... 
X-Git-Tag: 1.31.0-rc.0~30964
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/?a=commitdiff_plain;h=f351e54d6c950e16c00db859d6a07097cbb1d2e3;p=lhc%2Fweb%2Fwiklou.git

Quick fix for bug 15892: intermittent SQL-based cache failures during parser test runs.
---

diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
index 58f0b29507..1e795936da 100644
--- a/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@ -748,8 +748,9 @@ class ParserTest {
 		$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.
+		# It seems to have been fixed since (r55079?), but regressed at some point before r85701.
+		# This works around it for now...
+		ObjectCache::$instances[CACHE_DB] = new HashBagOStuff;
 
 		# CREATE TEMPORARY TABLE breaks if there is more than one server
 		if ( wfGetLB()->getServerCount() != 1 ) {