| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -1509,7 +1509,7 @@ |
| 1510 | 1510 | if( $wgUseSquid ) { |
| 1511 | 1511 | // Commit the transaction before the purge is sent |
| 1512 | 1512 | $dbw = wfGetDB( DB_MASTER ); |
| 1513 | | - $dbw->immediateCommit(); |
| | 1513 | + $dbw->commit(); |
| 1514 | 1514 | |
| 1515 | 1515 | // Send purge |
| 1516 | 1516 | $update = SquidUpdate::newSimplePurge( $this->mTitle ); |
| Index: trunk/phase3/includes/db/DatabaseMysql.php |
| — | — | @@ -129,7 +129,7 @@ |
| 130 | 130 | $this->mOpened = false; |
| 131 | 131 | if ( $this->mConn ) { |
| 132 | 132 | if ( $this->trxLevel() ) { |
| 133 | | - $this->immediateCommit(); |
| | 133 | + $this->commit(); |
| 134 | 134 | } |
| 135 | 135 | return mysql_close( $this->mConn ); |
| 136 | 136 | } else { |
| Index: trunk/phase3/includes/db/Database.php |
| — | — | @@ -1878,7 +1878,7 @@ |
| 1879 | 1879 | |
| 1880 | 1880 | # Commit any open transactions |
| 1881 | 1881 | if ( $this->mTrxLevel ) { |
| 1882 | | - $this->immediateCommit(); |
| | 1882 | + $this->commit(); |
| 1883 | 1883 | } |
| 1884 | 1884 | |
| 1885 | 1885 | if ( !is_null( $this->mFakeSlaveLag ) ) { |
| Index: trunk/phase3/includes/db/DatabaseMssql.php |
| — | — | @@ -131,7 +131,7 @@ |
| 132 | 132 | function close() { |
| 133 | 133 | $this->mOpened = false; |
| 134 | 134 | if ($this->mConn) { |
| 135 | | - if ($this->trxLevel()) $this->immediateCommit(); |
| | 135 | + if ($this->trxLevel()) $this->commit(); |
| 136 | 136 | return mssql_close($this->mConn); |
| 137 | 137 | } else return true; |
| 138 | 138 | } |
| Index: trunk/phase3/includes/db/DatabaseSqlite.php |
| — | — | @@ -79,7 +79,7 @@ |
| 80 | 80 | function close() { |
| 81 | 81 | $this->mOpened = false; |
| 82 | 82 | if ( is_object( $this->mConn ) ) { |
| 83 | | - if ( $this->trxLevel() ) $this->immediateCommit(); |
| | 83 | + if ( $this->trxLevel() ) $this->commit(); |
| 84 | 84 | $this->mConn = null; |
| 85 | 85 | } |
| 86 | 86 | return true; |
| Index: trunk/phase3/includes/db/LoadBalancer.php |
| — | — | @@ -809,7 +809,7 @@ |
| 810 | 810 | foreach ( $this->mConns as $conns2 ) { |
| 811 | 811 | foreach ( $conns2 as $conns3 ) { |
| 812 | 812 | foreach ( $conns3 as $conn ) { |
| 813 | | - $conn->immediateCommit(); |
| | 813 | + $conn->commit(); |
| 814 | 814 | } |
| 815 | 815 | } |
| 816 | 816 | } |
| Index: trunk/phase3/includes/filerepo/LocalFile.php |
| — | — | @@ -937,7 +937,7 @@ |
| 938 | 938 | |
| 939 | 939 | # Commit the transaction now, in case something goes wrong later |
| 940 | 940 | # The most important thing is that files don't get lost, especially archives |
| 941 | | - $dbw->immediateCommit(); |
| | 941 | + $dbw->commit(); |
| 942 | 942 | |
| 943 | 943 | # Invalidate cache for all pages using this file |
| 944 | 944 | $update = new HTMLCacheUpdate( $this->getTitle(), 'imagelinks' ); |
| Index: trunk/phase3/includes/ExternalStoreDB.php |
| — | — | @@ -140,7 +140,7 @@ |
| 141 | 141 | throw new MWException( __METHOD__.': no insert ID' ); |
| 142 | 142 | } |
| 143 | 143 | if ( $dbw->getFlag( DBO_TRX ) ) { |
| 144 | | - $dbw->immediateCommit(); |
| | 144 | + $dbw->commit(); |
| 145 | 145 | } |
| 146 | 146 | return "DB://$cluster/$id"; |
| 147 | 147 | } |