X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fdb%2FDatabaseMysqli.php;h=b8d5d7925acf384c1524f3b77bdc7f33149d06f9;hb=e016f6aa9386f515398d07d25419650c1fb74bf6;hp=8c9b06c31ad5746eb16fc7ea89669a24b3d01616;hpb=0ff2c62197fdaf79f82d8657afd70621725c9762;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/db/DatabaseMysqli.php b/includes/db/DatabaseMysqli.php
index 8c9b06c31a..b8d5d7925a 100644
--- a/includes/db/DatabaseMysqli.php
+++ b/includes/db/DatabaseMysqli.php
@@ -87,17 +87,12 @@ class DatabaseMysqli extends DatabaseMysqlBase {
 		} else {
 			$mysqli->options( MYSQLI_SET_CHARSET_NAME, 'binary' );
 		}
+		$mysqli->options( MYSQLI_OPT_CONNECT_TIMEOUT, 3 );
 
-		$numAttempts = 2;
-		for ( $i = 0; $i < $numAttempts; $i++ ) {
-			if ( $i > 1 ) {
-				usleep( 1000 );
-			}
-			if ( $mysqli->real_connect( $realServer, $this->mUser,
-				$this->mPassword, $this->mDBname, $port, null, $connFlags )
-			) {
-				return $mysqli;
-			}
+		if ( $mysqli->real_connect( $realServer, $this->mUser,
+			$this->mPassword, $this->mDBname, $port, null, $connFlags )
+		) {
+			return $mysqli;
 		}
 
 		return false;