| Index: trunk/phase3/maintenance/renamewiki.php |
| — | — | @@ -78,7 +78,7 @@ |
| 79 | 79 | $extdb->query( "ALTER TABLE {$from}.blobs RENAME TO {$to}.blobs" ); |
| 80 | 80 | $extdb->selectDB( $from ); |
| 81 | 81 | $extdb->sourceFile( $this->getDir() . '/storage/blobs.sql' ); |
| 82 | | - $extdb->immediateCommit(); |
| | 82 | + $extdb->commit(); |
| 83 | 83 | } |
| 84 | 84 | } |
| 85 | 85 | $this->output( "done.\n" ); |
| Index: trunk/phase3/maintenance/refreshLinks.php |
| — | — | @@ -203,7 +203,7 @@ |
| 204 | 204 | $parserOutput = $wgParser->parse( $revision->getText(), $wgTitle, $options, true, true, $revision->getId() ); |
| 205 | 205 | $update = new LinksUpdate( $wgTitle, $parserOutput, false ); |
| 206 | 206 | $update->doUpdate(); |
| 207 | | - $dbw->immediateCommit(); |
| | 207 | + $dbw->commit(); |
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | /* |
| Index: trunk/phase3/maintenance/moveBatch.php |
| — | — | @@ -94,7 +94,7 @@ |
| 95 | 95 | if( $err !== true ) { |
| 96 | 96 | $this->output( "\nFAILED: $err" ); |
| 97 | 97 | } |
| 98 | | - $dbw->immediateCommit(); |
| | 98 | + $dbw->commit(); |
| 99 | 99 | $this->output( "\n" ); |
| 100 | 100 | |
| 101 | 101 | if ( $interval ) { |
| Index: trunk/phase3/maintenance/removeUnusedAccounts.php |
| — | — | @@ -95,12 +95,12 @@ |
| 96 | 96 | 'image' => 'img', 'oldimage' => 'oi' ); |
| 97 | 97 | $count = 0; |
| 98 | 98 | |
| 99 | | - $dbo->immediateBegin(); |
| | 99 | + $dbo->begin(); |
| 100 | 100 | foreach( $checks as $table => $fprefix ) { |
| 101 | 101 | $conds = array( $fprefix . '_user' => $id ); |
| 102 | 102 | $count += (int)$dbo->selectField( $table, 'COUNT(*)', $conds, __METHOD__ ); |
| 103 | 103 | } |
| 104 | | - $dbo->immediateCommit(); |
| | 104 | + $dbo->commit(); |
| 105 | 105 | |
| 106 | 106 | return $count == 0; |
| 107 | 107 | } |
| Index: trunk/phase3/maintenance/updateSpecialPages.php |
| — | — | @@ -122,7 +122,7 @@ |
| 123 | 123 | $this->output( "Reconnected\n\n" ); |
| 124 | 124 | } else { |
| 125 | 125 | # Commit the results |
| 126 | | - $dbw->immediateCommit(); |
| | 126 | + $dbw->commit(); |
| 127 | 127 | } |
| 128 | 128 | # Wait for the slave to catch up |
| 129 | 129 | wfWaitForSlaves( 5 ); |
| Index: trunk/phase3/maintenance/deleteBatch.php |
| — | — | @@ -93,7 +93,7 @@ |
| 94 | 94 | $art = new Article( $page ); |
| 95 | 95 | } |
| 96 | 96 | $success = $art->doDeleteArticle( $reason ); |
| 97 | | - $dbw->immediateCommit(); |
| | 97 | + $dbw->commit(); |
| 98 | 98 | if ( $success ) { |
| 99 | 99 | $this->output( "\n" ); |
| 100 | 100 | } else { |
| Index: trunk/phase3/maintenance/addwiki.php |
| — | — | @@ -118,7 +118,7 @@ |
| 119 | 119 | $blobsFile = popen( $sedCmd, 'r' ); |
| 120 | 120 | $extdb->sourceStream( $blobsFile ); |
| 121 | 121 | pclose( $blobsFile ); |
| 122 | | - $extdb->immediateCommit(); |
| | 122 | + $extdb->commit(); |
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | |
| Index: trunk/phase3/maintenance/reassignEdits.php |
| — | — | @@ -67,7 +67,7 @@ |
| 68 | 68 | */ |
| 69 | 69 | private function doReassignEdits( &$from, &$to, $rc = false, $report = false ) { |
| 70 | 70 | $dbw = wfGetDB( DB_MASTER ); |
| 71 | | - $dbw->immediateBegin(); |
| | 71 | + $dbw->begin(); |
| 72 | 72 | |
| 73 | 73 | # Count things |
| 74 | 74 | $this->output( "Checking current edits..." ); |
| — | — | @@ -113,7 +113,7 @@ |
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | | - $dbw->immediateCommit(); |
| | 117 | + $dbw->commit(); |
| 118 | 118 | return (int)$total; |
| 119 | 119 | } |
| 120 | 120 | |
| Index: trunk/phase3/maintenance/cleanupSpam.php |
| — | — | @@ -109,7 +109,7 @@ |
| 110 | 110 | $this->output( "False match\n" ); |
| 111 | 111 | } else { |
| 112 | 112 | $dbw = wfGetDB( DB_MASTER ); |
| 113 | | - $dbw->immediateBegin(); |
| | 113 | + $dbw->begin(); |
| 114 | 114 | if ( !$rev ) { |
| 115 | 115 | // Didn't find a non-spammy revision, blank the page |
| 116 | 116 | $this->output( "blanking\n" ); |
| — | — | @@ -123,7 +123,7 @@ |
| 124 | 124 | $article = new Article( $title ); |
| 125 | 125 | $article->updateArticle( $rev->getText(), wfMsg( 'spam_reverting', $domain ), false, false ); |
| 126 | 126 | } |
| 127 | | - $dbw->immediateCommit(); |
| | 127 | + $dbw->commit(); |
| 128 | 128 | wfDoUpdates(); |
| 129 | 129 | } |
| 130 | 130 | } |
| Index: trunk/phase3/maintenance/deleteOrphanedRevisions.php |
| — | — | @@ -39,7 +39,7 @@ |
| 40 | 40 | $report = $this->hasOption('report'); |
| 41 | 41 | |
| 42 | 42 | $dbw = wfGetDB( DB_MASTER ); |
| 43 | | - $dbw->immediateBegin(); |
| | 43 | + $dbw->begin(); |
| 44 | 44 | list( $page, $revision ) = $dbw->tableNamesN( 'page', 'revision' ); |
| 45 | 45 | |
| 46 | 46 | # Find all the orphaned revisions |
| — | — | @@ -57,7 +57,7 @@ |
| 58 | 58 | |
| 59 | 59 | # Nothing to do? |
| 60 | 60 | if( $report || $count == 0 ) { |
| 61 | | - $dbw->immediateCommit(); |
| | 61 | + $dbw->commit(); |
| 62 | 62 | exit(0); |
| 63 | 63 | } |
| 64 | 64 | |
| — | — | @@ -67,7 +67,7 @@ |
| 68 | 68 | $this->output( "done.\n" ); |
| 69 | 69 | |
| 70 | 70 | # Close the transaction and call the script to purge unused text records |
| 71 | | - $dbw->immediateCommit(); |
| | 71 | + $dbw->commit(); |
| 72 | 72 | $this->purgeRedundantText( true ); |
| 73 | 73 | } |
| 74 | 74 | |
| Index: trunk/phase3/includes/db/DatabaseMssql.php |
| — | — | @@ -843,22 +843,6 @@ |
| 844 | 844 | } |
| 845 | 845 | |
| 846 | 846 | /** |
| 847 | | - * Begin a transaction, committing any previously open transaction |
| 848 | | - * @deprecated use begin() |
| 849 | | - */ |
| 850 | | - function immediateBegin( $fname = 'Database::immediateBegin' ) { |
| 851 | | - $this->begin(); |
| 852 | | - } |
| 853 | | - |
| 854 | | - /** |
| 855 | | - * Commit transaction, if one is open |
| 856 | | - * @deprecated use commit() |
| 857 | | - */ |
| 858 | | - function immediateCommit( $fname = 'Database::immediateCommit' ) { |
| 859 | | - $this->commit(); |
| 860 | | - } |
| 861 | | - |
| 862 | | - /** |
| 863 | 847 | * Return MW-style timestamp used for MySQL schema |
| 864 | 848 | */ |
| 865 | 849 | function timestamp( $ts=0 ) { |