Merge "rdbms: clean up DBO_TRX behavior for onTransactionPreCommitOrIdle()"

diff --cc includes/libs/rdbms/database/Database.php
index 00bc1cb,003bca0..417f64c
--- 1/includes/libs/rdbms/database/Database.php
--- 2/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@@ -3395,19 -3294,13 +3395,13 @@@ abstract class Database implements IDat
        }
  
        final public function rollback( $fname = __METHOD__, $flush = '' ) {
-               if ( $flush === self::FLUSHING_INTERNAL || $flush === self::FLUSHING_ALL_PEERS ) {
-                       if ( !$this->trxLevel ) {
-                               return; // nothing to do
-                       }
-               } else {
-                       if ( !$this->trxLevel ) {
-                               $this->queryLogger->error(
-                                       "$fname: No transaction to rollback, something got out of sync." );
-                               return; // nothing to do
-                       } elseif ( $this->getFlag( self::DBO_TRX ) ) {
+               $trxActive = $this->trxLevel;
+ 
+               if ( $flush !== self::FLUSHING_INTERNAL && $flush !== self::FLUSHING_ALL_PEERS ) {
+                       if ( $this->getFlag( self::DBO_TRX ) ) {
                                throw new DBUnexpectedError(
                                        $this,
 -                                      "$fname: Expected mass rollback of all peer databases (DBO_TRX set)."
 +                                      "$fname: Expected mass rollback of all peer transactions (DBO_TRX set)."
                                );
                        }
                }