Fix compilation issue when STAT4 is not enabled.

FossilOrigin-Name: 74a5454a710e1b7d8575cec2f872e6110aefce17

diff --git a/manifest b/manifest
index 5a780681cbe2e90f1d2d38bd88f5872670f8b49d..3a8265365f17af34bd3c647d2f36edde0303096a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Attempt\sto\suse\ssqlite_stat4\sdata\sto\sestimate\sthe\snumber\sof\srows\svisited\sby\sa\srange\squery\sthat\suses\sa\sskip-scan.\sThis\scode\sis\slargely\suntested.
-D 2014-06-26T20:21:46.005
+C Fix\scompilation\sissue\swhen\sSTAT4\sis\snot\senabled.
+D 2014-06-26T21:32:09.075
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in b03432313a3aad96c706f8164fb9f5307eaf19f5
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -296,7 +296,7 @@ F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
-F src/where.c 643abd2dce6650d537c240c1ecdfc4090271091f
+F src/where.c 0396f040a1ffe31b1f63673c6cd6c469c5e4ce57
 F src/whereInt.h 929c1349b5355fd44f22cee5c14d72b3329c58a6
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -1180,10 +1180,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 9ca737c0b41f87998d842e7772c3e483bb291c50
-R 48ab9caf5628261ea5cdb35094645ef7
-T *branch * stat4-skipscan
-T *sym-stat4-skipscan *
-T -sym-trunk *
-U dan
-Z a77d7df51663ffd17fb07ab0f5d5231a
+P 01dc8102592427b71a18c2cb82301d2266dd59c2
+R 1ded9652c09c1b748cd5e7181ce5016c
+U mistachkin
+Z b89953846d49961fb37fc288882b8874

diff --git a/manifest.uuid b/manifest.uuid
index 4422476212c2cb9e2248ee40ec7fd7765fa5305b..7e63e6d9db605c64c6f85e0dc5849906f14ddad0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-01dc8102592427b71a18c2cb82301d2266dd59c2
\ No newline at end of file
+74a5454a710e1b7d8575cec2f872e6110aefce17
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index a500b5a024d36627d7e64cbbf8a6e9b4ab8632a8..a8c8bccde4f9329fbe2c93a8275adb06a1b36e61 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -1999,6 +1999,7 @@ static LogEst whereRangeAdjust(WhereTerm *pTerm, LogEst nNew){
   return nRet;
 }
 
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
 /* 
 ** This function is called to estimate the number of rows visited by a
 ** range-scan on a skip-scan index. For example:
@@ -2091,6 +2092,7 @@ static int whereRangeSkipScanEst(
 
   return rc;
 }
+#endif /* SQLITE_ENABLE_STAT3_OR_STAT4 */
 
 /*
 ** This function is used to estimate the number of rows that will be visited