Reverting r85784 for good measure too

(Pending better solution)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9034363..942e192 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -236,7 +236,6 @@ PHP if you have not done so prior to upgrading MediaWiki.
 * (bug 28372) Fix bogus link to suppressed file versions in ForeignDBRepo
 * (bug 27473) Fix regression: bold, italic no longer interfere with linktrail for ca, kaa
 * (bug 28444) Fix regression: edit-on-doubleclick retains revision id again
-* (bug 27639) Transaction timeout when trying to OldLocalFile::upgradeRow()
 
 === API changes in 1.18 ===
 * (bug 26339) Throw warning when truncating an overlarge API result

diff --git a/includes/filerepo/OldLocalFile.php b/includes/filerepo/OldLocalFile.php
index 6d025fe..7e733cc 100644 (file)
--- a/includes/filerepo/OldLocalFile.php
+++ b/includes/filerepo/OldLocalFile.php
@@ -160,13 +160,9 @@ class OldLocalFile extends LocalFile {
                        return;
                }
 
+               $dbw = $this->repo->getMasterDB();
                list( $major, $minor ) = self::splitMime( $this->mime );
 
-               // https://bugzilla.wikimedia.org/show_bug.cgi?id=27639
-               // Create and use a new loadBalancer object, to prevent "1205: Lock wait timeout exceeded;"
-               $lb = wfGetLBFactory()->newMainLB();
-               $dbw = $lb->getConnection( DB_MASTER );
-
                wfDebug(__METHOD__.': upgrading '.$this->archive_name." to the current schema\n");
                $dbw->update( 'oldimage',
                        array(
@@ -183,9 +179,6 @@ class OldLocalFile extends LocalFile {
                                'oi_archive_name' => $this->archive_name ),
                        __METHOD__
                );
-
-               $lb->commitMasterChanges();
-               $lb->closeAll();
                wfProfileOut( __METHOD__ );
        }