Merge "rdbms: use Database::getDomainId for transaction logging calls"

diff --combined includes/libs/rdbms/database/Database.php
index d3b1ba8,2fc3638..e35e082
--- 1/includes/libs/rdbms/database/Database.php
--- 2/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@@ -1132,11 -1132,11 +1132,11 @@@ abstract class Database implements IDat
                if ( $this->trxLevel && !$this->trxDoneWrites && $isWrite ) {
                        $this->trxDoneWrites = true;
                        $this->trxProfiler->transactionWritingIn(
-                               $this->server, $this->dbName, $this->trxShortId );
+                               $this->server, $this->getDomainID(), $this->trxShortId );
                }
  
                if ( $this->getFlag( self::DBO_DEBUG ) ) {
-                       $this->queryLogger->debug( "{$this->dbName} {$commentedSql}" );
+                       $this->queryLogger->debug( "{$this->getDomainID()} {$commentedSql}" );
                }
  
                # Send the query to the server and fetch any corresponding errors
@@@ -3856,7 -3856,7 +3856,7 @@@
                        $this->lastWriteTime = microtime( true );
                        $this->trxProfiler->transactionWritingOut(
                                $this->server,
-                               $this->dbName,
+                               $this->getDomainID(),
                                $this->trxShortId,
                                $writeTime,
                                $this->trxWriteAffectedRows
@@@ -3907,7 -3907,7 +3907,7 @@@
                        if ( $this->trxDoneWrites ) {
                                $this->trxProfiler->transactionWritingOut(
                                        $this->server,
-                                       $this->dbName,
+                                       $this->getDomainID(),
                                        $this->trxShortId,
                                        $writeTime,
                                        $this->trxWriteAffectedRows
@@@ -4590,7 -4590,7 +4590,7 @@@
         */
        public function __clone() {
                $this->connLogger->warning(
 -                      "Cloning " . static::class . " is not recomended; forking connection:\n" .
 +                      "Cloning " . static::class . " is not recommended; forking connection:\n" .
                        ( new RuntimeException() )->getTraceAsString()
                );