Merge "Log to DBPerformance log when many LB connections are acquired"

[lhc/web/wiklou.git] / includes / db / DatabaseMysqlBase.php

diff --git a/includes/db/DatabaseMysqlBase.php b/includes/db/DatabaseMysqlBase.php
index 071bf96..f02aa93 100644 (file)
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -71,7 +71,6 @@ abstract class DatabaseMysqlBase extends DatabaseBase {
                $this->mPassword = $password;
                $this->mDBname = $dbName;
 
-
                # The kernel's default SYN retransmission period is far too slow for us,
                # so we use a short timeout plus a manual retry. Retrying means that a small
                # but finite rate of SYN packet loss won't cause user-visible errors.
@@ -85,7 +84,6 @@ abstract class DatabaseMysqlBase extends DatabaseBase {
                }
                $error = $this->restoreErrorHandler();
 
-
                # Always log connection errors
                if ( !$this->mConn ) {
                        if ( !$error ) {
@@ -102,7 +100,6 @@ abstract class DatabaseMysqlBase extends DatabaseBase {
                                "Server: $server, User: $user, Password: " .
                                substr( $password, 0, 3 ) . "..., error: " . $error . "\n" );
 
-
                        $this->reportConnectionError( $error );
                }
 
@@ -120,7 +117,6 @@ abstract class DatabaseMysqlBase extends DatabaseBase {
                                wfDebug( "Error selecting database $dbName on server {$this->mServer} " .
                                        "from client host " . wfHostname() . "\n" );
 
-
                                $this->reportConnectionError( "Error selecting database $dbName" );
                        }
                }
@@ -698,7 +694,6 @@ abstract class DatabaseMysqlBase extends DatabaseBase {
                        }
                }
 
-
                return $status;
        }