Add #ifdefs for test coverage. Add a testcase().

FossilOrigin-Name: be2702ce35c713b33c9b7689643b45fb0de6af2a

diff --git a/manifest b/manifest
index c24d03cdc7907aefcce30e89d30514e5260ed571..a856daec139bf4f6312f049874cbb0b00886b58a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sa\stest\scase\sin\swal2.test\sthat\sexplicitly\scorrupts\sa\schecksum\sin\sthe\swal\sfile\sto\saccount\sfor\sthe\sfact\sthat\sthe\sfirst\sbyte\sof\ssaid\schecksum\smay\sinitially\sbe\s0xFF.
-D 2014-05-01T10:19:16.340
+C Add\s#ifdefs\sfor\stest\scoverage.\s\sAdd\sa\stestcase().
+D 2014-05-01T20:24:21.190
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -159,7 +159,7 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 3d8b83c91651f53472ca17599dae3457b8b89494
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
 F src/alter.c b00900877f766f116f9e16116f1ccacdc21d82f1
-F src/analyze.c 92f1495304dd33b4f9e0b0e5aa030b068ada504d
+F src/analyze.c 3596f863bb80126fe56ba217df5932749271efc8
 F src/attach.c 3801129015ef59d76bf23c95ef9b0069d18a0c52
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
@@ -292,7 +292,7 @@ F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
-F src/where.c 3eaf3d241d86452c0f21aa3fe2b5df25d8c99a24
+F src/where.c 9e67d6c48006445d964bc835ea82500c190c3a6f
 F src/whereInt.h 6804c2e5010378568c2bb1350477537755296a46
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -1166,7 +1166,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 9bbca48b42e4fe16f2188e18dc736da30a96435c
-R 82092de2428e80a3b03a937e23116b0e
-U dan
-Z f6ffad5e4f0572fc8e2909e59c29de84
+P 2b935bdea1452505f36dc8c7aad49e6c42f4eceb
+R a1dff26029b41608141f15cdd82c4ee9
+U drh
+Z 39b43641ac7d3a2ec2ad0946638e023c

diff --git a/manifest.uuid b/manifest.uuid
index 98d646217d9328b51c409c62611bc2d583ae8bae..c97cdf989be813dfe948d92051678a565753fc91 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2b935bdea1452505f36dc8c7aad49e6c42f4eceb
\ No newline at end of file
+be2702ce35c713b33c9b7689643b45fb0de6af2a
\ No newline at end of file

diff --git a/src/analyze.c b/src/analyze.c
index 4fbaaa5173633af7a5bafc04ff0bcbbd4b9aab86..2952b364c36c12f3cd9ad25687e470945af77a63 100644 (file)
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -1390,9 +1390,15 @@ static void decodeIntArray(
       v = v*10 + c - '0';
       z++;
     }
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
     if( aOut ){
       aOut[i] = v;
-    }else{
+    }else
+#else
+    assert( aOut==0 );
+    UNUSED_PARAMETER(aOut);
+#endif
+    {
       aLog[i] = sqlite3LogEst(v);
     }
     if( *z==' ' ) z++;

diff --git a/src/where.c b/src/where.c
index 3b96e5fbea867552a09f7302b5625a7b544cf14f..238d1ef42ad8a525f172ddb4092c40a883f2ddf4 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -4200,6 +4200,7 @@ static int whereLoopAddBtreeIndex(
       assert( pNew->nOut==saved_nOut );
       if( pTerm->truthProb<=0 && iCol>=0 ){
         assert( (eOp & WO_IN) || nIn==0 );
+        testcase( eOp & WO_IN );
         pNew->nOut += pTerm->truthProb;
         pNew->nOut -= nIn;
         pNew->wsFlags |= WHERE_LIKELIHOOD;