From: Platonides <platonides@users.mediawiki.org>
Date: Tue, 22 Feb 2011 10:26:00 +0000 (+0000)
Subject: Merge r67177 from 1.16wmf4
X-Git-Tag: 1.31.0-rc.0~31832
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=c9e56fd3dcb8737efc6c523a964da5d5667b043e;p=lhc%2Fweb%2Fwiklou.git

Merge r67177 from 1.16wmf4
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 708b0e2b14..d78f4054e9 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -732,7 +732,10 @@ abstract class DatabaseBase implements DatabaseType {
 				$sqlx = strtr( $sqlx, "\t\n", '  ' );
 				global $wgRequestTime;
 				$elapsed = round( microtime( true ) - $wgRequestTime, 3 );
-				wfLogDBError( "Connection lost and reconnected after {$elapsed}s, query: $sqlx\n" );
+				if ( $elapsed < 300 ) {
+					# Not a database error to lose a transaction after a minute or two
+					wfLogDBError( "Connection lost and reconnected after {$elapsed}s, query: $sqlx\n" );
+				}
 				$ret = $this->doQuery( $commentedSql );
 			} else {
 				wfDebug( "Failed\n" );