[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.28.0-wmf.20]: Set an initial dummy domain in Database::__construct()

2016-09-22 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Set an initial dummy domain in Database::__construct()
..


Set an initial dummy domain in Database::__construct()

This avoids errors when LoadBalancer calls getWikiId() in
reallyOpenConnection() after a failed connection.

Change-Id: Idc3d93ae39be09f2da277df57cdc5a564cb3408d
(cherry picked from commit aa9ef623ecdbb74978c3dd27a262dc5c7ee69046)
---
M includes/libs/rdbms/database/Database.php
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Aaron Schulz: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/libs/rdbms/database/Database.php 
b/includes/libs/rdbms/database/Database.php
index 9b4e4ac..9a040d9 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -274,6 +274,9 @@
// Set initial dummy domain until open() sets the final 
DB/prefix
$this->currentDomain = DatabaseDomain::newUnspecified();
 
+   // Set initial dummy domain until open() sets the final 
DB/prefix
+   $this->currentDomain = DatabaseDomain::newUnspecified();
+
if ( $user ) {
$this->open( $server, $user, $password, $dbName );
} elseif ( $this->requiresDatabaseUser() ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/312179
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc3d93ae39be09f2da277df57cdc5a564cb3408d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.20
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.28.0-wmf.20]: Set an initial dummy domain in Database::__construct()

2016-09-21 Thread Aaron Schulz (Code Review) 
Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/312179

Change subject: Set an initial dummy domain in Database::__construct()
..

Set an initial dummy domain in Database::__construct()

This avoids errors when LoadBalancer calls getWikiId() in
reallyOpenConnection() after a failed connection.

Change-Id: Idc3d93ae39be09f2da277df57cdc5a564cb3408d
(cherry picked from commit aa9ef623ecdbb74978c3dd27a262dc5c7ee69046)
---
M includes/libs/rdbms/database/Database.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/79/312179/1

diff --git a/includes/libs/rdbms/database/Database.php 
b/includes/libs/rdbms/database/Database.php
index 9b4e4ac..9a040d9 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -274,6 +274,9 @@
// Set initial dummy domain until open() sets the final 
DB/prefix
$this->currentDomain = DatabaseDomain::newUnspecified();
 
+   // Set initial dummy domain until open() sets the final 
DB/prefix
+   $this->currentDomain = DatabaseDomain::newUnspecified();
+
if ( $user ) {
$this->open( $server, $user, $password, $dbName );
} elseif ( $this->requiresDatabaseUser() ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/312179
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc3d93ae39be09f2da277df57cdc5a564cb3408d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.20
Gerrit-Owner: Aaron Schulz 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits