From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Tue, 1 Sep 2009 22:37:37 +0000 (+0000)
Subject: May as well use the master for start/end points
X-Git-Tag: 1.31.0-rc.0~39976
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=2142fb46af16e85d65d6832546f946fc22ceb79b;p=lhc%2Fweb%2Fwiklou.git

May as well use the master for start/end points
---

diff --git a/maintenance/migrateUserGroup.php b/maintenance/migrateUserGroup.php
index 9ac70d110f..ed9cd0325e 100644
--- a/maintenance/migrateUserGroup.php
+++ b/maintenance/migrateUserGroup.php
@@ -35,10 +35,10 @@ class MigrateUserGroup extends Maintenance {
 		$count = 0;
 		$oldGroup = $this->getArg( 0 );
 		$newGroup = $this->getArg( 1 );
-		$dbr = wfGetDB( DB_SLAVE );
-		$start = $dbr->selectField( 'user_groups', 'MIN(ug_user)',
+		$dbw = wfGetDB( DB_MASTER );
+		$start = $dbw->selectField( 'user_groups', 'MIN(ug_user)',
 			array('ug_group' => $oldGroup), __FUNCTION__ );
-		$end = $dbr->selectField( 'user_groups', 'MAX(ug_user)',
+		$end = $dbw->selectField( 'user_groups', 'MAX(ug_user)',
 			array('ug_group' => $oldGroup), __FUNCTION__ );
 		if( $start === null ) {
 			$this->error( "Nothing to do - no users in the '$oldGroup' group", true );
@@ -48,7 +48,6 @@ class MigrateUserGroup extends Maintenance {
 		$blockStart = $start;
 		$blockEnd = $start + $this->mBatchSize - 1;
 		// Migrate users over in batches...
-		$dbw = wfGetDB( DB_MASTER );
 		while( $blockEnd <= $end ) {
 			$this->output( "Doing users $blockStart to $blockEnd\n" );
 			$dbw->begin();