| Index: trunk/phase3/includes/Block.php |
| — | — | @@ -889,15 +889,8 @@ |
| 890 | 890 | * Purge expired blocks from the ipblocks table |
| 891 | 891 | */ |
| 892 | 892 | public static function purgeExpired() { |
| 893 | | - // https://bugzilla.wikimedia.org/show_bug.cgi?id=28485 |
| 894 | | - // Create and use a new loadBalancer object, to prevent "1205: Lock wait timeout exceeded;" |
| 895 | | - $lb = wfGetLBFactory()->newMainLB(); |
| 896 | | - $dbw = $lb->getConnection( DB_MASTER ); |
| 897 | | - |
| | 893 | + $dbw = wfGetDB( DB_MASTER ); |
| 898 | 894 | $dbw->delete( 'ipblocks', array( 'ipb_expiry < ' . $dbw->addQuotes( $dbw->timestamp() ) ), __METHOD__ ); |
| 899 | | - |
| 900 | | - $lb->commitMasterChanges(); |
| 901 | | - $lb->closeAll(); |
| 902 | 895 | } |
| 903 | 896 | |
| 904 | 897 | /** |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -236,11 +236,9 @@ |
| 237 | 237 | * (bug 28372) Fix bogus link to suppressed file versions in ForeignDBRepo |
| 238 | 238 | * (bug 27473) Fix regression: bold, italic no longer interfere with linktrail for ca, kaa |
| 239 | 239 | * (bug 28444) Fix regression: edit-on-doubleclick retains revision id again |
| 240 | | -* (bug 28485) Block::purgeExpired Database returned error "1205: Lock wait timeout |
| 241 | | - exceeded;" |
| 242 | 240 | * (bug 27639) Transaction timeout when trying to OldLocalFile::upgradeRow() |
| 243 | 241 | |
| 244 | | - === API changes in 1.18 === |
| | 242 | +=== API changes in 1.18 === |
| 245 | 243 | * (bug 26339) Throw warning when truncating an overlarge API result |
| 246 | 244 | * (bug 14869) Add API module for accessing QueryPage-based special pages |
| 247 | 245 | * (bug 14020) API for Special:Unwatchedpages |