From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 21 Nov 2013 23:19:43 +0000 (-0800)
Subject: Truncate super long SQL in DB error log lines (useful for blobs)
X-Git-Tag: 1.31.0-rc.0~17971^2
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=e3e6008743bc2389756124ef7a2e4e714f0469c2;p=lhc%2Fweb%2Fwiklou.git

Truncate super long SQL in DB error log lines (useful for blobs)

Change-Id: Ibb9b9178de80e691406e5c1a7113f0511055d18d
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 9ba1851632..f70934b08f 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1105,7 +1105,7 @@ abstract class DatabaseBase implements IDatabase, DatabaseType {
 			wfDebug( "SQL ERROR (ignored): $error\n" );
 			$this->ignoreErrors( $ignore );
 		} else {
-			$sql1line = str_replace( "\n", "\\n", $sql );
+			$sql1line = mb_substr( str_replace( "\n", "\\n", $sql ), 0, 5*1024 );
 			wfLogDBError( "$fname\t{$this->mServer}\t$errno\t$error\t$sql1line\n" );
 			wfDebug( "SQL ERROR: " . $error . "\n" );
 			throw new DBQueryError( $this, $error, $errno, $sql, $fname );