From: drh <drh@noemail.net>
Date: Wed, 4 Sep 2013 02:07:38 +0000 (+0000)
Subject: Conditionally exclude code from analyze.c that is not used by STAT3.
X-Git-Tag: version-3.8.1~98
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=30f07042dfa4166d20e8ac1cbbc35465cc8d5f5e;p=thirdparty%2Fsqlite.git

Conditionally exclude code from analyze.c that is not used by STAT3.

FossilOrigin-Name: a48948a170056dfb87541dd5eb2773094dec6f8a
---

diff --git a/manifest b/manifest
index 0a72bf87ba..3fb45c08e5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Harden\sthe\sSTAT4\slogic\sin\swhere.c\sagainst\sOOM\sfaults.
-D 2013-09-03T19:26:22.132
+C Conditionally\sexclude\scode\sfrom\sanalyze.c\sthat\sis\snot\sused\sby\sSTAT3.
+D 2013-09-04T02:07:38.666
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -157,7 +157,7 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
 F src/alter.c 2af0330bb1b601af7a7789bf7229675fd772a083
-F src/analyze.c 51e6e5d56aaee93465a530d8f9e7a9b69cf9702c
+F src/analyze.c a492484869888fe5faf6f154e83cd1a8cb02d7ea
 F src/attach.c fea00cab11c854646a27641a263f5876569a51f9
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 2f1987981139bd2f6d8c728d64bf09fb387443c3
@@ -1109,7 +1109,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P d59f580904e6e7e90fc0a692a3dd4eeff5942479
-R fe3c8072a3f0ead6396100d646dd55b5
+P 91d2cfbc95c34c0040deb69106bb9f895abb94c0
+R de4c0b4db329755c881b794576ecab1d
 U drh
-Z 4e9e05f19356d6ec8498cc0ab2084861
+Z 4998967182f8bfcd840ee000c0017287
diff --git a/manifest.uuid b/manifest.uuid
index fc2add064f..12b5cd65ce 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-91d2cfbc95c34c0040deb69106bb9f895abb94c0
\ No newline at end of file
+a48948a170056dfb87541dd5eb2773094dec6f8a
\ No newline at end of file
diff --git a/src/analyze.c b/src/analyze.c
index 99a0a2fd8b..4091e5b6e6 100644
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -465,6 +465,7 @@ static void sampleInsert(Stat4Accum *p, Stat4Sample *pNew, int nEqZero){
 
   assert( IsStat4 || nEqZero==0 );
 
+#ifdef SQLITE_ENABLE_STAT4
   if( pNew->isPSample==0 ){
     Stat4Sample *pUpgrade = 0;
     assert( pNew->anEq[pNew->iCol]>0 );
@@ -491,6 +492,7 @@ static void sampleInsert(Stat4Accum *p, Stat4Sample *pNew, int nEqZero){
       goto find_new_min;
     }
   }
+#endif
 
   /* If necessary, remove sample iMin to make room for the new sample. */
   if( p->nSample>=p->mxSample ){