Index: trunk/phase3/includes/User.php |
— | — | @@ -1729,18 +1729,12 @@ |
1730 | 1730 | if( $this->mId ) { |
1731 | 1731 | $this->mTouched = self::newTouchedTimestamp(); |
1732 | 1732 | |
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 ); |
1738 | 1734 | $dbw->update( 'user', |
1739 | 1735 | array( 'user_touched' => $dbw->timestamp( $this->mTouched ) ), |
1740 | 1736 | array( 'user_id' => $this->mId ), |
1741 | 1737 | __METHOD__ ); |
1742 | 1738 | |
1743 | | - $lb->commitMasterChanges(); |
1744 | | - $lb->closeAll(); |
1745 | 1739 | $this->clearSharedCache(); |
1746 | 1740 | } |
1747 | 1741 | } |
Index: trunk/phase3/RELEASE-NOTES |
— | — | @@ -237,7 +237,6 @@ |
238 | 238 | * (bug 28444) Fix regression: edit-on-doubleclick retains revision id again |
239 | 239 | * (bug 28485) Block::purgeExpired Database returned error "1205: Lock wait timeout |
240 | 240 | exceeded;" |
241 | | -* (bug 20468) User::invalidateCache throws 1205: Lock wait timeout exceeded |
242 | 241 | * (bug 27639) Transaction timeout when trying to OldLocalFile::upgradeRow() |
243 | 242 | * (bug 13921) deadlocks mass-deleting media files in categories |
244 | 243 | |