| Index: trunk/phase3/includes/filerepo/OldLocalFile.php |
| — | — | @@ -160,13 +160,9 @@ |
| 161 | 161 | return; |
| 162 | 162 | } |
| 163 | 163 | |
| | 164 | + $dbw = $this->repo->getMasterDB(); |
| 164 | 165 | list( $major, $minor ) = self::splitMime( $this->mime ); |
| 165 | 166 | |
| 166 | | - // https://bugzilla.wikimedia.org/show_bug.cgi?id=27639 |
| 167 | | - // Create and use a new loadBalancer object, to prevent "1205: Lock wait timeout exceeded;" |
| 168 | | - $lb = wfGetLBFactory()->newMainLB(); |
| 169 | | - $dbw = $lb->getConnection( DB_MASTER ); |
| 170 | | - |
| 171 | 167 | wfDebug(__METHOD__.': upgrading '.$this->archive_name." to the current schema\n"); |
| 172 | 168 | $dbw->update( 'oldimage', |
| 173 | 169 | array( |
| — | — | @@ -183,9 +179,6 @@ |
| 184 | 180 | 'oi_archive_name' => $this->archive_name ), |
| 185 | 181 | __METHOD__ |
| 186 | 182 | ); |
| 187 | | - |
| 188 | | - $lb->commitMasterChanges(); |
| 189 | | - $lb->closeAll(); |
| 190 | 183 | wfProfileOut( __METHOD__ ); |
| 191 | 184 | } |
| 192 | 185 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -236,7 +236,6 @@ |
| 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 27639) Transaction timeout when trying to OldLocalFile::upgradeRow() |
| 241 | 240 | |
| 242 | 241 | === API changes in 1.18 === |
| 243 | 242 | * (bug 26339) Throw warning when truncating an overlarge API result |