jenkins-bot has submitted this change and it was merged.
Change subject: Support empty DB names in LoadBalancer more fully
......................................................................
Support empty DB names in LoadBalancer more fully
* This convention to avoid selecting a DB is already supported for
new connections but not when an existing foreign wiki connection
is reused. This avoids giving PHP notices.
Change-Id: Ic6e9ed031bc8ea6d6f519b6998f0414364c087d0
---
M includes/db/LoadBalancer.php
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 186915c..eeb2fec 100644
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -655,7 +655,9 @@
$conn = reset( $this->mConns['foreignFree'][$i] );
$oldWiki = key( $this->mConns['foreignFree'][$i] );
- if ( !$conn->selectDB( $dbName ) ) {
+ // The empty string as a DB name means "don't care".
+ // DatabaseMysqlBase::open() already handle this on
connection.
+ if ( $dbName !== '' && !$conn->selectDB( $dbName ) ) {
$this->mLastError = "Error selecting database
$dbName on server " .
$conn->getServer() . " from client host
" . wfHostname() . "\n";
$this->mErrorConnection = $conn;
--
To view, visit https://gerrit.wikimedia.org/r/170870
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic6e9ed031bc8ea6d6f519b6998f0414364c087d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Parent5446 <tylerro...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
