From: Aaron <aschulz@wikimedia.org>
Date: Fri, 20 Apr 2012 23:34:43 +0000 (-0700)
Subject: Destroy any lock manager connections when forking.
X-Git-Tag: 1.31.0-rc.0~23850^2
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=fbecd7781bdc632dbf6c619ad1be68d9445c50ab;p=lhc%2Fweb%2Fwiklou.git

Destroy any lock manager connections when forking.

Change-Id: I320ac659559eb82378da0b9afbbb1dd3e48ba41c
---

diff --git a/includes/ForkController.php b/includes/ForkController.php
index 8649fe7167..569d836d51 100644
--- a/includes/ForkController.php
+++ b/includes/ForkController.php
@@ -120,6 +120,7 @@ class ForkController {
 		// Don't share DB, storage, or memcached connections
 		wfGetLBFactory()->destroyInstance();
 		FileBackendGroup::destroySingleton();
+		LockManagerGroup::destroySingleton();
 		ObjectCache::clear();
 		$wgMemc = null;
 	}