Fix two compiler errors associated with non-standard compile-time options.

FossilOrigin-Name: e3bf2d5ce4f87535e030a446e03d911f421805f7

diff --git a/manifest b/manifest
index e86a51a12611a5ac64b69433afd6cbb455a4e8ed..03779ff4cbdc901aff53476c4a22a67a1490ab72 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\scompiler\swarning\sand\san\sunreachable\sbranch.\s\sRestore\s100%\sbranch\stest\ncoverage.
-D 2011-04-01T01:38:02.348
+C Fix\stwo\scompiler\serrors\sassociated\swith\snon-standard\scompile-time\soptions.
+D 2011-04-01T02:26:36.020
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -115,7 +115,7 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
 F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
 F src/alter.c 6a0c176e64a34929a4436048066a84ef4f1445b3
-F src/analyze.c b3a3d2e648f0140e6adf7ca087dc0b9a062a6325
+F src/analyze.c 6b536214aece5100f4814b715b1a9f096193bf14
 F src/attach.c 438ea6f6b5d5961c1f49b737f2ce0f14ce7c6877
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 537f89c7ef5021cb580f31f782e556ffffcb2ed1
@@ -244,7 +244,7 @@ F src/vtab.c e1edca38c4c4310710635bb91bb3c87fdf60f21d
 F src/wal.c 7334009b396285b658a95a3b6bc6d2b016a1f794
 F src/wal.h 7a5fbb00114b7f2cd40c7e1003d4c41ce9d26840
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
-F src/where.c a6e89fe7e56ab7e633be6fdebdddd857e9e5bc99
+F src/where.c 176574bfeee13775761ce56416f773b0ec115d3f
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
 F test/all.test 51756962d522e474338e9b2ebb26e7364d4aa125
@@ -920,7 +920,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P a84f7711949ea3885b0e36e48118d2c76a8a5b82
-R c6eafc0e317fd480113e33c20661f505
+P 4dc148bb4cec5ecba167cdcb4959a4f0fa05a96f
+R 6db83e8558722fd3bd0df3d6934e094c
 U drh
-Z d52e84775787a11d1858b0fd0e126e84
+Z 0287bc47bbe647ced5d0be0c2b89e260

diff --git a/manifest.uuid b/manifest.uuid
index bbc6fcf05b72ab09bd288e624ad0dce208f05806..2a0b14059400c04a302065c567356a8fd07e30df 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4dc148bb4cec5ecba167cdcb4959a4f0fa05a96f
\ No newline at end of file
+e3bf2d5ce4f87535e030a446e03d911f421805f7
\ No newline at end of file

diff --git a/src/analyze.c b/src/analyze.c
index 22ff38822b51d994d0574212512698c549895e96..7c31e04dde920c13dd7b501bcbee5a8a3cd8e0a9 100644 (file)
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -124,6 +124,7 @@ static void analyzeOneTable(
   int regRowid = iMem++;       /* Rowid for the inserted record */
 
 #ifdef SQLITE_ENABLE_STAT2
+  int addr = 0;                /* Instruction address */
   int regTemp2 = iMem++;       /* Temporary use register */
   int regSamplerecno = iMem++; /* Index of next sample to record */
   int regRecno = iMem++;       /* Current sample index */

diff --git a/src/where.c b/src/where.c
index cdcaa98c019904a27ce7d873e984201f3beb126b..5d8b8f4ad5633105363163c63026412b90355050 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -2942,7 +2942,7 @@ static void bestBtreeIndex(
     if( nRow>(double)1 && nEq==1 && pFirstTerm!=0 ){
       if( pFirstTerm->eOperator & (WO_EQ|WO_ISNULL) ){
         testcase( pFirstTerm->eOperator==WO_EQ );
-        testcase( pFirstTerm->pOperator==WO_ISNULL );
+        testcase( pFirstTerm->eOperator==WO_ISNULL );
         whereEqualScanEst(pParse, pProbe, pFirstTerm->pExpr->pRight, &nRow);
       }else if( pFirstTerm->eOperator==WO_IN && bInEst==0 ){
         whereInScanEst(pParse, pProbe, pFirstTerm->pExpr->x.pList, &nRow);