Add an #ifndef so that the build works with SQLITE_OMIT_ANALYZE again.

FossilOrigin-Name: b084828a771ec40be85f07c590ca99de4f6c24ee

diff --git a/manifest b/manifest
index 193d587f609da36d9050c33a9cdb1ddd1bfe74f2..a60879173bb6dc8cd69e9919de9afe7b67c80b3c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Omit\sthe\smutexIsInit\stest\svariable\swhen\smutexes\sare\sdisabled.
-D 2009-09-10T22:30:54
+C Add\san\s#ifndef\sso\sthat\sthe\sbuild\sworks\swith\sSQLITE_OMIT_ANALYZE\sagain.
+D 2009-09-11T14:05:07
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in e360e1214027efbf62cf18ac80ec646d4081c272
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -112,7 +112,7 @@ F src/btmutex.c 0f43a75bb5b8147b386e8e1c3e71ba734e3863b7
 F src/btree.c 9c425425784c5d569bc0309c22251698ba906451
 F src/btree.h 577448a890c2ab9b21e6ab74f073526184bceebe
 F src/btreeInt.h 1c86297e69380f6577e7ae67452597dd8d5c2705
-F src/build.c 7569d7e263927530a75751fabd3e8889392f104a
+F src/build.c f7da9f9a1df77d787965d0ff07d3de53c4ccade5
 F src/callback.c f49c305dc94b78da948953c392963929c0e70f9b
 F src/complete.c 5ad5c6cd4548211867c204c41a126d73a9fbcea0
 F src/date.c 6d936393716d21e6dc0d4222b3443137a60ebe93
@@ -753,14 +753,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P f42ec993ac9d42ca31305f26b09924108c36d9f4
-R 3ea2699beae26ad5b007c144fdc59e2d
+P 3ea10434434d27a1300ba2b58e2c47c54909f4ff
+R 95c31677dc8d1c12479e36e634d801e1
 U drh
-Z 4b41f9d3c74653a3e3a2a57ba20fb338
+Z 7b513ccbcffd750f7a69cf7a6fd26e32
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFKqX4ioxKgR168RlERAhR8AJ41xXSlhxWFgE+4152tP+l7d/BFMwCeP8VW
-bwBx8uUK3N5J2wL/7GHguzE=
-=fxQD
+iD8DBQFKqlkXoxKgR168RlERArI2AJ9XBYwztmwaUuO/RYePR8pofGMuuACdHPzW
+fK5pOQuHlmeSj7hYiSdeyrU=
+=IU3N
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index fb15f1d390a4473611e77e036ba5654512573e20..c05cbca93e3775fc323d1feb8bfd947e9c061284 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3ea10434434d27a1300ba2b58e2c47c54909f4ff
\ No newline at end of file
+b084828a771ec40be85f07c590ca99de4f6c24ee
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 159f066ed106413373bb5604a9926932c946e657..f4f62ea823f28be40cdb39d9f8f473f9121a65f6 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -346,8 +346,9 @@ Index *sqlite3FindIndex(sqlite3 *db, const char *zName, const char *zDb){
 */
 static void freeIndex(Index *p){
   sqlite3 *db = p->pTable->dbMem;
-  /* testcase( db==0 ); */
+#ifndef SQLITE_OMIT_ANALYZE
   sqlite3DeleteIndexSamples(p);
+#endif
   sqlite3DbFree(db, p->zColAff);
   sqlite3DbFree(db, p);
 }