| Index: trunk/phase3/includes/db/Database.php |
| — | — | @@ -732,7 +732,10 @@ |
| 733 | 733 | $sqlx = strtr( $sqlx, "\t\n", ' ' ); |
| 734 | 734 | global $wgRequestTime; |
| 735 | 735 | $elapsed = round( microtime( true ) - $wgRequestTime, 3 ); |
| 736 | | - wfLogDBError( "Connection lost and reconnected after {$elapsed}s, query: $sqlx\n" ); |
| | 736 | + if ( $elapsed < 300 ) { |
| | 737 | + # Not a database error to lose a transaction after a minute or two |
| | 738 | + wfLogDBError( "Connection lost and reconnected after {$elapsed}s, query: $sqlx\n" ); |
| | 739 | + } |
| 737 | 740 | $ret = $this->doQuery( $commentedSql ); |
| 738 | 741 | } else { |
| 739 | 742 | wfDebug( "Failed\n" ); |
| Property changes on: trunk/phase3/includes/db/Database.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 740 | 743 | Merged /branches/wmf/1.16wmf4/includes/db/Database.php:r67177 |