Move a conditional inside of an #ifdef in order to make all branches

reachable regardless of compile-time options used.

FossilOrigin-Name: f7cc30d45b77f58c258b21f5823c2b39a44e2bf5

diff --git a/manifest b/manifest
index ec7c7a73b6cbb6a85f2e270658b796c05ef933b6..7d258a314652914e45ab10e470cb012a22245eee 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stest\scases\sfor\sthe\snew\sinformation\sin\sPRAGMA\sindex_list.
-D 2013-10-08T22:25:22.225
+C Move\sa\sconditional\sinside\sof\san\s#ifdef\sin\sorder\sto\smake\sall\sbranches\nreachable\sregardless\sof\scompile-time\soptions\sused.
+D 2013-10-08T23:16:48.921
 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 c27da55795a11d09bea74259782c3e11e9750534
+F src/analyze.c bc391d7c98247b402e053176dbc26d6fa3fca689
 F src/attach.c 0a17c9364895316ca4f52d06a97a72c0af1ae8b3
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 2f1987981139bd2f6d8c728d64bf09fb387443c3
@@ -1121,7 +1121,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 65553ff34b41e54d129ff2fee96be714105503c4
-R d3d1b6ad57e8af21028db8307fcc9c99
+P dd03be1065537679c2daf5e4200902c47714fceb
+R f20e6d4e438216466d250cd8b119b240
 U drh
-Z d60d26e04d8b288fede2321c4c580bed
+Z 57caf4818cc792e398e89d2b5ddc9030

diff --git a/manifest.uuid b/manifest.uuid
index fbd543035f934f87ed0c5c4571ee6739e507d9af..b28ec7360864872eb4a5c2aa20fa343df7ffc077 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dd03be1065537679c2daf5e4200902c47714fceb
\ No newline at end of file
+f7cc30d45b77f58c258b21f5823c2b39a44e2bf5
\ No newline at end of file

diff --git a/src/analyze.c b/src/analyze.c
index 84232ebe5d8f2761379bfac719d95fa59dcc5875..d02c516f9ea4185b3c098c96b61768fd08e55f64 100644 (file)
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -1274,7 +1274,12 @@ static void decodeIntArray(
     aOut[i] = v;
     if( *z==' ' ) z++;
   }
-  if( pIndex ){
+#ifndef SQLITE_ENABLE_STAT3_OR_STAT4
+  assert( pIndex!=0 );
+#else
+  if( pIndex )
+#endif
+  {
     if( strcmp(z, "unordered")==0 ){
       pIndex->bUnordered = 1;
     }else if( sqlite3_strglob("sz=[0-9]*", z)==0 ){