Merge "use slave for row estimate in updateCollation.php"

diff --combined maintenance/updateCollation.php
index 5882ff5,dc9431f..2db0139
--- 1/maintenance/updateCollation.php
--- 2/maintenance/updateCollation.php
+++ b/maintenance/updateCollation.php
@@@ -70,6 -70,7 +70,7 @@@ TEX
                global $wgCategoryCollation;
  
                $dbw = $this->getDB( DB_MASTER );
+               $dbr = $this->getDB( DB_SLAVE );
                $force = $this->getOption( 'force' );
                $dryRun = $this->getOption( 'dry-run' );
                $verboseStats = $this->getOption( 'verbose-stats' );
@@@ -97,7 -98,6 +98,7 @@@
                $options = [
                        'LIMIT' => self::BATCH_SIZE,
                        'ORDER BY' => $orderBy,
 +                      'STRAIGHT_JOIN' // per T58041
                ];
  
                if ( $force || $dryRun ) {
@@@ -111,7 -111,7 +112,7 @@@
                                ];
                        }
  
-                       $count = $dbw->estimateRowCount(
+                       $count = $dbr->estimateRowCount(
                                'categorylinks',
                                '*',
                                $collationConds,
@@@ -119,7 -119,7 +120,7 @@@
                        );
                        // Improve estimate if feasible
                        if ( $count < 1000000 ) {
-                               $count = $dbw->selectField(
+                               $count = $dbr->selectField(
                                        'categorylinks',
                                        'COUNT(*)',
                                        $collationConds,
@@@ -132,6 -132,7 +133,7 @@@
                                return;
                        }
                        $this->output( "Fixing collation for $count rows.\n" );
+                       wfWaitForSlaves();
                }
                $count = 0;
                $batchCount = 0;