Merge r67177 from 1.16wmf4

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 708b0e2..d78f405 100644 (file)
--- 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" );