From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 16 Aug 2018 13:31:11 +0000 (-0700)
Subject: rdbms: remove some dead code in LoadBalancer::setDomainPrefix
X-Git-Tag: 1.34.0-rc.0~4410^2
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=106f63299611de7a6c2b3471037e6b936995682a;p=lhc%2Fweb%2Fwiklou.git

rdbms: remove some dead code in LoadBalancer::setDomainPrefix

Change-Id: I594a390b446c00eb604b0be63f67b2c8cbd45758
---

diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 5e08094242..fbc3be96be 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -1928,14 +1928,14 @@ class LoadBalancer implements ILoadBalancer {
 				"Foreign domain connections are still in use ($domains)." );
 		}
 
-		$oldDomain = $this->localDomain->getId();
 		$this->setLocalDomain( new DatabaseDomain(
 			$this->localDomain->getDatabase(),
 			$this->localDomain->getSchema(),
 			$prefix
 		) );
 
-		$this->forEachOpenConnection( function ( IDatabase $db ) use ( $prefix, $oldDomain ) {
+		// Update the prefix for all local connections...
+		$this->forEachOpenConnection( function ( IDatabase $db ) use ( $prefix ) {
 			if ( !$db->getLBInfo( 'foreign' ) ) {
 				$db->tablePrefix( $prefix );
 			}