* (bug 28444) Fix regression: edit-on-doubleclick retains revision id again
* (bug 28485) Block::purgeExpired Database returned error "1205: Lock wait timeout
exceeded;"
+* (bug 20468) User::invalidateCache throws 1205: Lock wait timeout exceeded
=== API changes in 1.18 ===
* (bug 26339) Throw warning when truncating an overlarge API result
if( $this->mId ) {
$this->mTouched = self::newTouchedTimestamp();
- $dbw = wfGetDB( DB_MASTER );
+ // https://bugzilla.wikimedia.org/show_bug.cgi?id=20468
+ // Create and use a new loadBalancer object, to prevent "1205: Lock wait timeout exceeded;"
+ $lb = wfGetLBFactory()->newMainLB();
+ $dbw = $lb->getConnection( DB_MASTER );
+
$dbw->update( 'user',
array( 'user_touched' => $dbw->timestamp( $this->mTouched ) ),
array( 'user_id' => $this->mId ),
__METHOD__ );
+ $lb->commitMasterChanges();
+ $lb->closeAll();
$this->clearSharedCache();
}
}