Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert r85783, it seems to brake random stuff in random places #fail

Browse source
This commit is contained in:
Sam Reed 2011-04-11 18:29:18 +00:00
parent c68957c5e3
commit 488f7a375c
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
RELEASE-NOTES
View file

@ -237,7 +237,6 @@ PHP if you have not done so prior to upgrading MediaWiki.
* (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
* (bug 27639) Transaction timeout when trying to OldLocalFile::upgradeRow()
* (bug 13921) deadlocks mass-deleting media files in categories

8
includes/User.php
View file

@ -1729,18 +1729,12 @@ class User {
if( $this->mId ) {
$this->mTouched = self::newTouchedTimestamp();
// 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 = wfGetDB( DB_MASTER );
$dbw->update( 'user',
array( 'user_touched' => $dbw->timestamp( $this->mTouched ) ),
array( 'user_id' => $this->mId ),
__METHOD__ );
$lb->commitMasterChanges();
$lb->closeAll();
$this->clearSharedCache();
}
}