Merge "Made master connection expectations actually work"

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 1a7a97d..b3c81f9 100644 (file)
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -817,10 +817,6 @@ abstract class DatabaseBase implements IDatabase {
                if ( $user ) {
                        $this->open( $server, $user, $password, $dbName );
                }
-
-               $isMaster = !is_null( $this->getLBInfo( 'master' ) );
-               $trxProf = $this->getTransactionProfiler();
-               $trxProf->recordConnection( $this->mServer, $this->mDBname, $isMaster );
        }
 
        /**

diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 917d703..dd95844 100644 (file)
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -756,6 +756,10 @@ class LoadBalancer {
                        $db = $e->db;
                }
 
+               $isMaster = !empty( $server['master'] );
+               $trxProf = Profiler::instance()->getTransactionProfiler();
+               $trxProf->recordConnection( $server['host'], $server['dbname'], $isMaster );
+
                $db->setLBInfo( $server );
                if ( isset( $server['fakeSlaveLag'] ) ) {
                        $db->setFakeSlaveLag( $server['fakeSlaveLag'] );