| Index: branches/wmf/1.17wmf1/includes/db/LoadBalancer.php |
| — | — | @@ -367,7 +367,7 @@ |
| 368 | 368 | /** |
| 369 | 369 | * Wait for a given slave to catch up to the master pos stored in $this |
| 370 | 370 | */ |
| 371 | | - function doWait( $index, $open ) { |
| | 371 | + function doWait( $index, $open = false ) { |
| 372 | 372 | # Find a connection to wait on |
| 373 | 373 | $conn = $this->getAnyOpenConnection( $index ); |
| 374 | 374 | if ( !$conn ) { |
| Property changes on: branches/wmf/1.17wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 375 | 375 | Merged /trunk/phase3/includes:r83590 |
| Property changes on: branches/wmf/1.17wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 376 | 376 | Merged /trunk/phase3:r83590 |