From: Reedy <reedy@wikimedia.org>
Date: Fri, 20 Jun 2014 20:15:31 +0000 (+0100)
Subject: Add wfWaitForSlaves() call in DatabaseUpdater::runUpdates()
X-Git-Tag: 1.31.0-rc.0~9791^2
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=05ee7808c889232dad6743238d8e62c3833a4488;p=lhc%2Fweb%2Fwiklou.git

Add wfWaitForSlaves() call in DatabaseUpdater::runUpdates()

Related to bug T68887, but not the complete fix

Bug: T68887
Change-Id: I7320ca04d91f81fdf43d17e33c66cfc58c21a30c
---

diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index 7070790156..57084cbe44 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -455,6 +455,7 @@ abstract class DatabaseUpdater {
 			flush();
 			if ( $ret !== false ) {
 				$updatesDone[] = $origParams;
+				wfWaitForSlaves();
 			} else {
 				$updatesSkipped[] = array( $func, $params, $origParams );
 			}