Merged in a change which causes update.php to be gentler (tests slave-lag). Part...

diff --git a/maintenance/update.php b/maintenance/update.php
index 3afb562..c1849b1 100644 (file)
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -88,6 +88,8 @@ class UpdateMediaWiki extends Maintenance {
                $wgTitle = Title::newFromText( "MediaWiki database updater" );
 
                $this->output( "MediaWiki {$wgVersion} Updater\n\n" );
+               
+               wfWaitForSlaves( 5 ); // let's not kill databases, shall we? ;) --tor
 
                if ( !$this->hasOption( 'skip-compat-checks' ) ) {
                        $this->compatChecks();