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

diff --combined includes/db/Database.php
index 8e1f93f,0082103..27e6dad
--- 1/includes/db/Database.php
--- 2/includes/db/Database.php
+++ b/includes/db/Database.php
@@@ -923,12 -923,6 +923,12 @@@ abstract class DatabaseBase implements 
                        }
                }
  
 +              # Keep track of whether the transaction has write queries pending
 +              if ( $this->mTrxLevel && !$this->mTrxDoneWrites && $this->isWriteQuery( $sql ) ) {
 +                      $this->mTrxDoneWrites = true;
 +                      Profiler::instance()->transactionWritingIn( $this->mServer, $this->mDBname );
 +              }
 +
                $isMaster = !is_null( $this->getLBInfo( 'master' ) );
                if ( !Profiler::instance()->isStub() ) {
                        # generalizeSQL will probably cut down the query to reasonable
@@@ -944,6 -938,12 +944,6 @@@
                        wfProfileIn( $queryProf );
                }
  
 -              # Keep track of whether the transaction has write queries pending
 -              if ( $this->mTrxLevel && !$this->mTrxDoneWrites && $this->isWriteQuery( $sql ) ) {
 -                      $this->mTrxDoneWrites = true;
 -                      Profiler::instance()->transactionWritingIn( $this->mServer, $this->mDBname );
 -              }
 -
                if ( $this->debug() ) {
                        static $cnt = 0;
  
@@@ -1605,7 -1605,8 +1605,8 @@@
                $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;
        }