Merge "Removed old fake slave hacks used for debug log testing"

diff --combined includes/db/loadbalancer/LoadBalancer.php
index 21c8eb4,6669c67..3fcd349
--- 1/includes/db/loadbalancer/LoadBalancer.php
--- 2/includes/db/loadbalancer/LoadBalancer.php
+++ b/includes/db/loadbalancer/LoadBalancer.php
@@@ -250,7 -250,6 +250,7 @@@ class LoadBalancer 
  
                # No server found yet
                $i = false;
 +              $conn = false;
                # First try quickly looking through the available servers for a server that
                # meets our criteria
                $currentLoads = $nonErrorLoads;
@@@ -804,12 -803,6 +804,6 @@@
                }
  
                $db->setLBInfo( $server );
-               if ( isset( $server['fakeSlaveLag'] ) ) {
-                       $db->setFakeSlaveLag( $server['fakeSlaveLag'] );
-               }
-               if ( isset( $server['fakeMaster'] ) ) {
-                       $db->setFakeMaster( true );
-               }
  
                return $db;
        }