From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 23 Aug 2013 23:09:47 +0000 (+0000)
Subject: Merge "Avoid profiler spam for numeric IN() clauses for each possible number of items"
X-Git-Tag: 1.31.0-rc.0~18895
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=commitdiff_plain;h=f4fc43d42c39b9ea99018dd1153a51413d50f075;hp=db7207fbf4bd4f92653d0fca40d59486ea66f96e;p=lhc%2Fweb%2Fwiklou.git

Merge "Avoid profiler spam for numeric IN() clauses for each possible number of items"
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 8e1f93fa68..27e6dadb06 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1605,7 +1605,8 @@ abstract class DatabaseBase implements IDatabase, DatabaseType {
 		$sql = preg_replace( '/\s+/', ' ', $sql );
 
 		# All numbers => N
-		$sql = preg_replace( '/-?[0-9]+/s', 'N', $sql );
+		$sql = preg_replace( '/-?\d+(,-?\d+)+/s', 'N,...,N', $sql );
+		$sql = preg_replace( '/-?\d+/s', 'N', $sql );
 
 		return $sql;
 	}