Revert r85799
authorSam Reed <reedy@users.mediawiki.org>
Mon, 11 Apr 2011 18:37:29 +0000 (18:37 +0000)
committerSam Reed <reedy@users.mediawiki.org>
Mon, 11 Apr 2011 18:37:29 +0000 (18:37 +0000)
includes/LinksUpdate.php

index c0bf543..a800fdf 100644 (file)
@@ -345,22 +345,15 @@ class LinksUpdate {
                                $where = false;
                        }
                }
-
-               // Create and use a new loadBalancer object, to prevent "1205: Lock wait timeout exceeded;"
-               $lb = wfGetLBFactory()->newMainLB();
-               $dbw = $lb->getConnection( DB_MASTER );
-
                if ( $where ) {
-                       $dbw->delete( $table, $where, __METHOD__ );
+                       $this->mDb->delete( $table, $where, __METHOD__ );
                }
                if ( count( $insertions ) ) {
-                       $dbw->insert( $table, $insertions, __METHOD__, 'IGNORE' );
+                       $this->mDb->insert( $table, $insertions, __METHOD__, 'IGNORE' );
                }
-
-               $lb->commitMasterChanges();
-               $lb->closeAll();
        }
 
+
        /**
         * Get an array of pagelinks insertions for passing to the DB
         * Skips the titles specified by the 2-D array $existing