Merge "Use STRAIGHT_JOIN on updateCollation.php per jcrespo"

diff --git a/maintenance/updateCollation.php b/maintenance/updateCollation.php
index 6d9a616..5882ff5 100644 (file)
--- a/maintenance/updateCollation.php
+++ b/maintenance/updateCollation.php
@@ -97,6 +97,7 @@ TEXT
                $options = [
                        'LIMIT' => self::BATCH_SIZE,
                        'ORDER BY' => $orderBy,
+                       'STRAIGHT_JOIN' // per T58041
                ];
 
                if ( $force || $dryRun ) {