| Index: trunk/phase3/maintenance/storage/compressOld.php |
| — | — | @@ -293,7 +293,7 @@ |
| 294 | 294 | |
| 295 | 295 | $chunk = new ConcatenatedGzipHistoryBlob(); |
| 296 | 296 | $stubs = array(); |
| 297 | | - $dbw->begin(); |
| | 297 | + $dbw->begin( __METHOD__ ); |
| 298 | 298 | $usedChunk = false; |
| 299 | 299 | $primaryOldid = $revs[$i]->rev_text_id; |
| 300 | 300 | |
| — | — | @@ -393,7 +393,7 @@ |
| 394 | 394 | } |
| 395 | 395 | # Done, next |
| 396 | 396 | $this->output( "/" ); |
| 397 | | - $dbw->commit(); |
| | 397 | + $dbw->commit( __METHOD__ ); |
| 398 | 398 | $i += $thisChunkSize; |
| 399 | 399 | wfWaitForSlaves(); |
| 400 | 400 | } |
| Index: trunk/phase3/maintenance/moveBatch.php |
| — | — | @@ -92,13 +92,13 @@ |
| 93 | 93 | |
| 94 | 94 | |
| 95 | 95 | $this->output( $source->getPrefixedText() . ' --> ' . $dest->getPrefixedText() ); |
| 96 | | - $dbw->begin(); |
| | 96 | + $dbw->begin( __METHOD__ ); |
| 97 | 97 | $err = $source->moveTo( $dest, false, $reason ); |
| 98 | 98 | if ( $err !== true ) { |
| 99 | 99 | $msg = array_shift( $err[0] ); |
| 100 | 100 | $this->output( "\nFAILED: " . wfMsg( $msg, $err[0] ) ); |
| 101 | 101 | } |
| 102 | | - $dbw->commit(); |
| | 102 | + $dbw->commit( __METHOD__ ); |
| 103 | 103 | $this->output( "\n" ); |
| 104 | 104 | |
| 105 | 105 | if ( $interval ) { |
| Index: trunk/phase3/includes/filerepo/LocalRepo.php |
| — | — | @@ -64,7 +64,7 @@ |
| 65 | 65 | foreach ( $storageKeys as $key ) { |
| 66 | 66 | $hashPath = $this->getDeletedHashPath( $key ); |
| 67 | 67 | $path = "$root/$hashPath$key"; |
| 68 | | - $dbw->begin(); |
| | 68 | + $dbw->begin( __METHOD__ ); |
| 69 | 69 | // Check for usage in deleted/hidden files and pre-emptively |
| 70 | 70 | // lock the key to avoid any future use until we are finished. |
| 71 | 71 | $deleted = $this->deletedFileHasKey( $key, 'lock' ); |
| — | — | @@ -80,7 +80,7 @@ |
| 81 | 81 | wfDebug( __METHOD__ . ": $key still in use\n" ); |
| 82 | 82 | $status->successCount++; |
| 83 | 83 | } |
| 84 | | - $dbw->commit(); |
| | 84 | + $dbw->commit( __METHOD__ ); |
| 85 | 85 | } |
| 86 | 86 | return $status; |
| 87 | 87 | } |
| Index: trunk/phase3/includes/revisiondelete/RevisionDeleteAbstracts.php |
| — | — | @@ -38,7 +38,7 @@ |
| 39 | 39 | $this->res = false; |
| 40 | 40 | $dbw = wfGetDB( DB_MASTER ); |
| 41 | 41 | $this->doQuery( $dbw ); |
| 42 | | - $dbw->begin(); |
| | 42 | + $dbw->begin( __METHOD__ ); |
| 43 | 43 | $status = Status::newGood(); |
| 44 | 44 | $missing = array_flip( $this->ids ); |
| 45 | 45 | $this->clearFileOps(); |
| — | — | @@ -137,7 +137,7 @@ |
| 138 | 138 | 'authorIds' => $authorIds, |
| 139 | 139 | 'authorIPs' => $authorIPs |
| 140 | 140 | ) ); |
| 141 | | - $dbw->commit(); |
| | 141 | + $dbw->commit( __METHOD__ ); |
| 142 | 142 | |
| 143 | 143 | // Clear caches |
| 144 | 144 | $status->merge( $this->doPostCommitUpdates() ); |
| Index: trunk/phase3/includes/FileDeleteForm.php |
| — | — | @@ -154,14 +154,14 @@ |
| 155 | 155 | if ( $page->doDeleteArticleReal( $reason, $suppress, 0, false, $error, $user ) >= WikiPage::DELETE_SUCCESS ) { |
| 156 | 156 | $status = $file->delete( $reason, $suppress ); |
| 157 | 157 | if( $status->isOK() ) { |
| 158 | | - $dbw->commit(); |
| | 158 | + $dbw->commit( __METHOD__ ); |
| 159 | 159 | } else { |
| 160 | | - $dbw->rollback(); |
| | 160 | + $dbw->rollback( __METHOD__ ); |
| 161 | 161 | } |
| 162 | 162 | } |
| 163 | 163 | } catch ( MWException $e ) { |
| 164 | 164 | // rollback before returning to prevent UI from displaying incorrect "View or restore N deleted edits?" |
| 165 | | - $dbw->rollback(); |
| | 165 | + $dbw->rollback( __METHOD__ ); |
| 166 | 166 | throw $e; |
| 167 | 167 | } |
| 168 | 168 | } |
| Index: trunk/phase3/includes/Category.php |
| — | — | @@ -260,7 +260,7 @@ |
| 261 | 261 | } |
| 262 | 262 | |
| 263 | 263 | $dbw = wfGetDB( DB_MASTER ); |
| 264 | | - $dbw->begin(); |
| | 264 | + $dbw->begin( __METHOD__ ); |
| 265 | 265 | |
| 266 | 266 | # Insert the row if it doesn't exist yet (e.g., this is being run via |
| 267 | 267 | # update.php from a pre-1.16 schema). TODO: This will cause lots and |
| — | — | @@ -300,7 +300,7 @@ |
| 301 | 301 | array( 'cat_title' => $this->mName ), |
| 302 | 302 | __METHOD__ |
| 303 | 303 | ); |
| 304 | | - $dbw->commit(); |
| | 304 | + $dbw->commit( __METHOD__ ); |
| 305 | 305 | |
| 306 | 306 | # Now we should update our local counts. |
| 307 | 307 | $this->mPages = $result->pages; |