Bug 11980: don't complain on rollback of non-transactional tables. Not sure how to...

diff --git a/includes/Database.php b/includes/Database.php
index 6966430..f873828 100644 (file)
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -2039,10 +2039,11 @@ class Database {
        }
 
        /**
-        * Rollback a transaction
+        * Rollback a transaction.
+        * No-op on non-transactional databases.
         */
        function rollback( $fname = 'Database::rollback' ) {
-               $this->query( 'ROLLBACK', $fname );
+               $this->query( 'ROLLBACK', $fname, true );
                $this->mTrxLevel = 0;
        }