Merge "Avoid fatals in begin/commit/rollback if close() was called"

diff --combined includes/db/Database.php
index 13efb81,5212d3c..8c06ef4
--- 1/includes/db/Database.php
--- 2/includes/db/Database.php
+++ b/includes/db/Database.php
@@@ -926,6 -926,7 +926,6 @@@ abstract class DatabaseBase implements 
                if ( count( $this->mTrxIdleCallbacks ) ) { // sanity
                        throw new MWException( "Transaction idle callbacks still pending." );
                }
 -              $this->mOpened = false;
                if ( $this->mConn ) {
                        if ( $this->trxLevel() ) {
                                if ( !$this->mTrxAutomatic ) {
@@@ -936,14 -937,13 +936,14 @@@
                                $this->commit( __METHOD__, 'flush' );
                        }
  
 -                      $ret = $this->closeConnection();
 +                      $closed = $this->closeConnection();
                        $this->mConn = false;
 -
 -                      return $ret;
                } else {
 -                      return true;
 +                      $closed = true;
                }
 +              $this->mOpened = false;
 +
 +              return $closed;
        }
  
        /**
@@@ -3417,6 -3417,11 +3417,11 @@@
                        $this->runOnTransactionIdleCallbacks();
                }
  
+               # Avoid fatals if close() was called
+               if ( !$this->isOpen() ) {
+                       throw new DBUnexpectedError( $this, "DB connection was already closed." );
+               }
+ 
                $this->doBegin( $fname );
                $this->mTrxFname = $fname;
                $this->mTrxDoneWrites = false;
@@@ -3475,6 -3480,11 +3480,11 @@@
                        }
                }
  
+               # Avoid fatals if close() was called
+               if ( !$this->isOpen() ) {
+                       throw new DBUnexpectedError( $this, "DB connection was already closed." );
+               }
+ 
                $this->runOnTransactionPreCommitCallbacks();
                $this->doCommit( $fname );
                if ( $this->mTrxDoneWrites ) {
@@@ -3525,6 -3535,11 +3535,11 @@@
                        }
                }
  
+               # Avoid fatals if close() was called
+               if ( !$this->isOpen() ) {
+                       throw new DBUnexpectedError( $this, "DB connection was already closed." );
+               }
+ 
                $this->doRollback( $fname );
                $this->mTrxIdleCallbacks = array(); // cancel
                $this->mTrxPreCommitCallbacks = array(); // cancel