r85809 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r85808‎ | r85809 | r85810 >
Date:18:29, 11 April 2011
Author:reedy
Status:ok
Tags:
Comment:
Revert r85783, it seems to brake random stuff in random places #fail
Modified paths:
  • /trunk/phase3/RELEASE-NOTES (modified) (history)
  • /trunk/phase3/includes/User.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/User.php
@@ -1729,18 +1729,12 @@
17301730 if( $this->mId ) {
17311731 $this->mTouched = self::newTouchedTimestamp();
17321732
1733 - // https://bugzilla.wikimedia.org/show_bug.cgi?id=20468
1734 - // Create and use a new loadBalancer object, to prevent "1205: Lock wait timeout exceeded;"
1735 - $lb = wfGetLBFactory()->newMainLB();
1736 - $dbw = $lb->getConnection( DB_MASTER );
1737 -
 1733+ $dbw = wfGetDB( DB_MASTER );
17381734 $dbw->update( 'user',
17391735 array( 'user_touched' => $dbw->timestamp( $this->mTouched ) ),
17401736 array( 'user_id' => $this->mId ),
17411737 __METHOD__ );
17421738
1743 - $lb->commitMasterChanges();
1744 - $lb->closeAll();
17451739 $this->clearSharedCache();
17461740 }
17471741 }
Index: trunk/phase3/RELEASE-NOTES
@@ -237,7 +237,6 @@
238238 * (bug 28444) Fix regression: edit-on-doubleclick retains revision id again
239239 * (bug 28485) Block::purgeExpired Database returned error "1205: Lock wait timeout
240240 exceeded;"
241 -* (bug 20468) User::invalidateCache throws 1205: Lock wait timeout exceeded
242241 * (bug 27639) Transaction timeout when trying to OldLocalFile::upgradeRow()
243242 * (bug 13921) deadlocks mass-deleting media files in categories
244243

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r85783* (bug 20468) User::invalidateCache throws 1205: Lock wait timeout exceededreedy12:56, 11 April 2011

Status & tagging log