Merge "Inject Profiler into Database objects"

diff --cc includes/db/loadbalancer/LBFactoryMW.php
index 16faeb7,b36197a..1063eef
--- 1/includes/db/loadbalancer/LBFactoryMW.php
--- 2/includes/db/loadbalancer/LBFactoryMW.php
+++ b/includes/db/loadbalancer/LBFactoryMW.php
@@@ -37,11 -37,12 +37,12 @@@ abstract class LBFactoryMW extends LBFa
         * @TODO: inject objects via dependency framework
         */
        public function __construct( array $conf ) {
 -              global $wgCommandLineMode, $wgSQLMode, $wgDBmysql5;
 +              global $wgCommandLineMode, $wgSQLMode, $wgDBmysql5, $wgDBname, $wgDBprefix;
  
                $defaults = [
 -                      'localDomain' => wfWikiID(),
 +                      'localDomain' => new DatabaseDomain( $wgDBname, null, $wgDBprefix ),
                        'hostname' => wfHostname(),
+                       'profiler' => Profiler::instance(),
                        'trxProfiler' => Profiler::instance()->getTransactionProfiler(),
                        'replLogger' => LoggerFactory::getInstance( 'DBReplication' ),
                        'queryLogger' => LoggerFactory::getInstance( 'wfLogDBError' ),

diff --cc includes/libs/rdbms/database/Database.php
Simple merge

diff --cc includes/libs/rdbms/lbfactory/LBFactory.php
Simple merge

diff --cc includes/libs/rdbms/loadbalancer/LoadBalancer.php
Simple merge