Pass __METHOD__ to DatabaseBase::begin(), DatabaseBase::commit() and DatabaseBase...

diff --git a/includes/ExternalStoreDB.php b/includes/ExternalStoreDB.php
index e11a53d..241c43c 100644 (file)
--- a/includes/ExternalStoreDB.php
+++ b/includes/ExternalStoreDB.php
@@ -158,7 +158,7 @@ class ExternalStoreDB {
                        throw new MWException( __METHOD__.': no insert ID' );
                }
                if ( $dbw->getFlag( DBO_TRX ) ) {
-                       $dbw->commit();
+                       $dbw->commit( __METHOD__ );
                }
                return "DB://$cluster/$id";
        }

diff --git a/includes/filerepo/backend/lockmanager/DBLockManager.php b/includes/filerepo/backend/lockmanager/DBLockManager.php
index 641e596..4a4dca0 100644 (file)
--- a/includes/filerepo/backend/lockmanager/DBLockManager.php
+++ b/includes/filerepo/backend/lockmanager/DBLockManager.php
@@ -276,7 +276,7 @@ class DBLockManager extends LockManager {
                        $this->initConnection( $lockDb, $this->conns[$lockDb] );
                }
                if ( !$this->conns[$lockDb]->trxLevel() ) {
-                       $this->conns[$lockDb]->begin(); // start transaction
+                       $this->conns[$lockDb]->begin( __METHOD__ ); // start transaction
                }
                return $this->conns[$lockDb];
        }
@@ -302,7 +302,7 @@ class DBLockManager extends LockManager {
                foreach ( $this->conns as $lockDb => $db ) {
                        if ( $db->trxLevel() ) { // in transaction
                                try {
-                                       $db->rollback(); // finish transaction and kill any rows
+                                       $db->rollback( __METHOD__ ); // finish transaction and kill any rows
                                } catch ( DBError $e ) {
                                        $status->fatal( 'lockmanager-fail-db-release', $lockDb );
                                }
@@ -391,7 +391,7 @@ class DBLockManager extends LockManager {
                foreach ( $this->conns as $lockDb => $db ) {
                        if ( $db->trxLevel() ) { // in transaction
                                try {
-                                       $db->rollback(); // finish transaction and kill any rows
+                                       $db->rollback( __METHOD__ ); // finish transaction and kill any rows
                                } catch ( DBError $e ) {
                                        // oh well
                                }

diff --git a/includes/installer/DatabaseInstaller.php b/includes/installer/DatabaseInstaller.php
index 8cbc8c6..14604c1 100644 (file)
--- a/includes/installer/DatabaseInstaller.php
+++ b/includes/installer/DatabaseInstaller.php
@@ -141,7 +141,7 @@ abstract class DatabaseInstaller {
                        $this->db = $status->value;
                        // Enable autocommit
                        $this->db->clearFlag( DBO_TRX );
-                       $this->db->commit();
+                       $this->db->commit( __METHOD__ );
                }
                return $status;
        }

diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php
index cd234cd..caec558 100644 (file)
--- a/includes/installer/MysqlInstaller.php
+++ b/includes/installer/MysqlInstaller.php
@@ -521,14 +521,14 @@ class MysqlInstaller extends DatabaseInstaller {
                                        } catch( DBQueryError $dqe ) {
                                                if( $this->db->lastErrno() == 1396 /* ER_CANNOT_USER */ ) {
                                                        // User (probably) already exists
-                                                       $this->db->rollback();
+                                                       $this->db->rollback( __METHOD__ );
                                                        $status->warning( 'config-install-user-alreadyexists', $dbUser );
                                                        $grantableNames[] = $fullName;
                                                        break;
                                                } else {
                                                        // If we couldn't create for some bizzare reason and the
                                                        // user probably doesn't exist, skip the grant
-                                                       $this->db->rollback();
+                                                       $this->db->rollback( __METHOD__ );
                                                        $status->warning( 'config-install-user-create-failed', $dbUser, $dqe->getText() );
                                                }
                                        }

diff --git a/includes/objectcache/SqlBagOStuff.php b/includes/objectcache/SqlBagOStuff.php
index 617c093..4dfa574 100644 (file)
--- a/includes/objectcache/SqlBagOStuff.php
+++ b/includes/objectcache/SqlBagOStuff.php
@@ -447,7 +447,7 @@ class SqlBagOStuff extends BagOStuff {
                }
 
                try {
-                       $db->rollback();
+                       $db->rollback( __METHOD__ );
                } catch ( DBQueryError $e ) {
                }
 

diff --git a/includes/revisiondelete/RevisionDeleteAbstracts.php b/includes/revisiondelete/RevisionDeleteAbstracts.php
index c187a8c..e109e65 100644 (file)
--- a/includes/revisiondelete/RevisionDeleteAbstracts.php
+++ b/includes/revisiondelete/RevisionDeleteAbstracts.php
@@ -111,7 +111,7 @@ abstract class RevDel_List extends RevisionListBase {
 
                if ( $status->successCount == 0 ) {
                        $status->ok = false;
-                       $dbw->rollback();
+                       $dbw->rollback( __METHOD__ );
                        return $status;
                }
 
@@ -122,7 +122,7 @@ abstract class RevDel_List extends RevisionListBase {
                $status->merge( $this->doPreCommitUpdates() );
                if ( !$status->isOK() ) {
                        // Fatal error, such as no configured archive directory
-                       $dbw->rollback();
+                       $dbw->rollback( __METHOD__ );
                        return $status;
                }