Merge "Made DB rollback() method properly bail out if no trx is active"

diff --combined includes/db/Database.php
index 6b6c62e,4ff38c5..415d03c
--- 1/includes/db/Database.php
--- 2/includes/db/Database.php
+++ b/includes/db/Database.php
@@@ -268,13 -268,6 +268,13 @@@ abstract class DatabaseBase implements 
         */
        protected $mTrxLevel = 0;
  
 +      /**
 +       * Either a short hexidecimal string if a transaction is active or ""
 +       *
 +       * @var string
 +       */
 +      protected $mTrxShortId = '';
 +
        /**
         * Remembers the function name given for starting the most recent transaction via begin().
         * Used to provide additional context for error reporting.
@@@ -1061,8 -1054,8 +1061,8 @@@
                # Keep track of whether the transaction has write queries pending
                if ( $this->mTrxLevel && !$this->mTrxDoneWrites && $this->isWriteQuery( $sql ) ) {
                        $this->mTrxDoneWrites = true;
 -                      $id = spl_object_hash( $this );
 -                      Profiler::instance()->transactionWritingIn( $this->mServer, $this->mDBname, $id );
 +                      Profiler::instance()->transactionWritingIn(
 +                              $this->mServer, $this->mDBname, $this->mTrxShortId );
                }
  
                $queryProf = '';
@@@ -1079,10 -1072,6 +1079,10 @@@
                                $queryProf = 'query: ' . substr( DatabaseBase::generalizeSQL( $sql ), 0, 255 );
                                $totalProf = 'DatabaseBase::query';
                        }
 +                      # Include query transaction state
 +                      $queryProf .= $this->mTrxShortId ? " [TRX#{$this->mTrxShortId}]" : "";
 +
 +                      $trx = $this->mTrxLevel ? 'TRX=yes' : 'TRX=no';
                        wfProfileIn( $totalProf );
                        wfProfileIn( $queryProf );
                }
@@@ -3423,8 -3412,8 +3423,8 @@@
                        $this->runOnTransactionPreCommitCallbacks();
                        $this->doCommit( $fname );
                        if ( $this->mTrxDoneWrites ) {
 -                              $id = spl_object_hash( $this );
 -                              Profiler::instance()->transactionWritingOut( $this->mServer, $this->mDBname, $id );
 +                              Profiler::instance()->transactionWritingOut(
 +                                      $this->mServer, $this->mDBname, $this->mTrxShortId );
                        }
                        $this->runOnTransactionIdleCallbacks();
                }
@@@ -3442,7 -3431,6 +3442,7 @@@
                $this->mTrxAtomicLevels = new SplStack;
                $this->mTrxIdleCallbacks = array();
                $this->mTrxPreCommitCallbacks = array();
 +              $this->mTrxShortId = wfRandomString( 12 );
        }
  
        /**
@@@ -3501,8 -3489,8 +3501,8 @@@
                $this->runOnTransactionPreCommitCallbacks();
                $this->doCommit( $fname );
                if ( $this->mTrxDoneWrites ) {
 -                      $id = spl_object_hash( $this );
 -                      Profiler::instance()->transactionWritingOut( $this->mServer, $this->mDBname, $id );
 +                      Profiler::instance()->transactionWritingOut(
 +                              $this->mServer, $this->mDBname, $this->mTrxShortId );
                }
                $this->runOnTransactionIdleCallbacks();
        }
@@@ -3537,6 -3525,7 +3537,7 @@@
                if ( $flush !== 'flush' ) {
                        if ( !$this->mTrxLevel ) {
                                wfWarn( "$fname: No transaction to rollback, something got out of sync!" );
+                               return; // nothing to do
                        } elseif ( $this->mTrxAutomatic ) {
                                wfWarn( "$fname: Explicit rollback of implicit transaction. Something may be out of sync!" );
                        }
@@@ -3558,8 -3547,8 +3559,8 @@@
                $this->mTrxPreCommitCallbacks = array(); // cancel
                $this->mTrxAtomicLevels = new SplStack;
                if ( $this->mTrxDoneWrites ) {
 -                      $id = spl_object_hash( $this );
 -                      Profiler::instance()->transactionWritingOut( $this->mServer, $this->mDBname, $id );
 +                      Profiler::instance()->transactionWritingOut(
 +                              $this->mServer, $this->mDBname, $this->mTrxShortId );
                }
        }