From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sun, 26 Feb 2012 17:19:11 +0000 (+0000)
Subject: Pass __METHOD__ to DatabaseBase::begin(), DatabaseBase::commit() and DatabaseBase... 
X-Git-Tag: 1.31.0-rc.0~24497
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=61a88f8c189509e4f6955075edfb09198697ef06;p=lhc%2Fweb%2Fwiklou.git

Pass __METHOD__ to DatabaseBase::begin(), DatabaseBase::commit() and DatabaseBase::rollback()
---

diff --git a/includes/ExternalStoreDB.php b/includes/ExternalStoreDB.php
index e11a53db53..241c43cc55 100644
--- 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 641e5965d7..4a4dca0450 100644
--- 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 8cbc8c686f..14604c162b 100644
--- 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 cd234cd1a5..caec558005 100644
--- 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 617c093944..4dfa5743dd 100644
--- 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 c187a8c161..e109e65297 100644
--- 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;
 		}