http://www.mediawiki.org/wiki/Special:Code/MediaWiki/83591
Revision: 83591
Author: reedy
Date: 2011-03-09 16:39:59 +0000 (Wed, 09 Mar 2011)
Log Message:
-----------
MFT r83590, fixing r83555
Modified Paths:
--------------
branches/wmf/1.17wmf1/includes/db/LoadBalancer.php
Property Changed:
----------------
branches/wmf/1.17wmf1/
branches/wmf/1.17wmf1/includes/
Property changes on: branches/wmf/1.17wmf1
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3:51646
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.16wmf4:67177,69199,76243,77266
/branches/wmf-deployment:60970
/trunk/phase3:79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,81833,83212
+ /branches/REL1_15/phase3:51646
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.16wmf4:67177,69199,76243,77266
/branches/wmf-deployment:60970
/trunk/phase3:79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,81833,83212,83590
Property changes on: branches/wmf/1.17wmf1/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.16wmf4/includes:67177,69199,76243,77266
/branches/wmf-deployment/includes:53381,60970
+ /branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.16wmf4/includes:67177,69199,76243,77266
/branches/wmf-deployment/includes:53381,60970
/trunk/phase3/includes:83590
Modified: branches/wmf/1.17wmf1/includes/db/LoadBalancer.php
===================================================================
--- branches/wmf/1.17wmf1/includes/db/LoadBalancer.php 2011-03-09 16:37:39 UTC
(rev 83590)
+++ branches/wmf/1.17wmf1/includes/db/LoadBalancer.php 2011-03-09 16:39:59 UTC
(rev 83591)
@@ -367,7 +367,7 @@
/**
* Wait for a given slave to catch up to the master pos stored in $this
*/
- function doWait( $index, $open ) {
+ function doWait( $index, $open = false ) {
# Find a connection to wait on
$conn = $this->getAnyOpenConnection( $index );
if ( !$conn ) {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
