Merge "rdbms: make Database::query() more readable and consistent"

diff --cc includes/libs/rdbms/database/Database.php
index 13bf8f0,19195b4..224bcf2
--- 1/includes/libs/rdbms/database/Database.php
--- 2/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@@ -1277,12 -1288,16 +1287,12 @@@ abstract class Database implements IDat
                $this->affectedRowCount = null;
                $ret = $this->doQuery( $commentedSql );
                $this->affectedRowCount = $this->affectedRows();
 -              if ( $this->profiler ) {
 -                      $this->profiler->profileOut( $queryProf );
 -              }
 +              unset( $ps ); // profile out (if set)
                $queryRuntime = max( microtime( true ) - $startTime, 0.0 );
  
 -              unset( $queryProfSection ); // profile out (if set)
 -
                if ( $ret !== false ) {
                        $this->lastPing = $startTime;
-                       if ( $isWrite && $this->trxLevel ) {
+                       if ( $isEffectiveWrite && $this->trxLevel ) {
                                $this->updateTrxWriteQueryTime( $sql, $queryRuntime, $this->affectedRows() );
                                $this->trxWriteCallers[] = $fname;
                        }

diff --cc tests/phpunit/includes/db/DatabaseTestHelper.php
Simple merge