* Fixed --server override on dumpTextPass.php

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 183e4f5..001a01e 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -319,6 +319,7 @@ fully support the editing toolbar, but was found to be too confusing.
   a raw string to abstract things a level.
 * (bug 4258) Use ugly urls for ISAPI by default
   patch by Rob Church
+* Fixed --server override on dumpTextPass.php
 
 
 === Caveats ===

diff --git a/maintenance/dumpTextPass.php b/maintenance/dumpTextPass.php
index 6b3b2ab..801ca1b 100644 (file)
--- a/maintenance/dumpTextPass.php
+++ b/maintenance/dumpTextPass.php
@@ -43,7 +43,7 @@ class TextPassDumper extends BackupDumper {
                
                $this->startTime = wfTime();
                
-               $this->db =& wfGetDB( DB_SLAVE );
+               $this->db =& $this->backupDb();
                $this->maxCount = $this->db->selectField( 'page', 'MAX(page_id)', '', 'BackupDumper::dump' );
                $this->startTime = wfTime();
                
@@ -195,6 +195,9 @@ class TextPassDumper extends BackupDumper {
 
 
 $dumper = new TextPassDumper( $argv );
+if( isset( $options['server'] ) ) {
+       $dumper->server = $options['server'];
+}
 
 if( true ) {
        $dumper->dump();
@@ -213,6 +216,7 @@ Options:
   --quiet     Don't dump status reports to stderr.
   --report=n  Report position and speed after every n pages processed.
               (Default: 100)
+  --server=h  Force reading from MySQL server h
 END
 );
 }