Testability enhancements.

FossilOrigin-Name: be44928cf2a3c063c8228b769d90947acbfad1ef

diff --git a/manifest b/manifest
index 46ae41ea868845b587454969b0ed5d67b5e1113b..343598e9a7a665856219bc183e05b27d645c17ef 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stypos\sin\sthe\sformat\sdescription\scomment\sof\sanalyze.c.
-D 2011-09-23T13:25:03.244
+C Testability\senhancements.
+D 2011-09-23T13:59:33.693
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in d314143fa6be24828021d3f583ad37d9afdce505
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -127,7 +127,7 @@ F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
 F src/btree.c 77b09c69d4849a90361e6fe5db36d167f20600c0
 F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce
 F src/btreeInt.h 67978c014fa4f7cc874032dd3aacadd8db656bc3
-F src/build.c 57e3b27c26e6754393cd63a2774a6c673df1e804
+F src/build.c 2dc09385981bf7f41eae7d3aeb47cb2453813456
 F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 F src/ctime.c dde6a9b835b9e8cc067b713de1a7f6a0c9ff807e
@@ -251,7 +251,7 @@ F src/vtab.c 901791a47318c0562cd0c676a2c6ff1bc530e582
 F src/wal.c 3154756177d6219e233d84291d5b05f4e06ff5e9
 F src/wal.h 66b40bd91bc29a5be1c88ddd1f5ade8f3f48728a
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
-F src/where.c 432a42cf4392bafe80ff06affb62cc24c8eea3fb
+F src/where.c aafcb21a74e41f9aae76ea604e1e787ff8574125
 F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@ -965,7 +965,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 374343c8ad53829c4ad715ed623d16635797de9a
-R e7e1b2a1114af9230eb2e44197ed5da5
+P 74e27fad339a2d7899c1f42805e615128929f07a
+R 2a02eac3daaa0669ad4c98fbdd4d2386
 U drh
-Z 6b4c74838ff582a42303843c6a42764e
+Z 0b4e185fe7f24f4f88a2a412ad76b268

diff --git a/manifest.uuid b/manifest.uuid
index 06cafe1e0c8e207b9c18f619babd46726a5b03c3..1d09d551ecba223821b229397f6eb303d51f7a75 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-74e27fad339a2d7899c1f42805e615128929f07a
\ No newline at end of file
+be44928cf2a3c063c8228b769d90947acbfad1ef
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 8318cb1ff2418feb3d139a89b788c4786e36ff6f..da0eaa1d4473a805d8151bc15a7242d8a762e167 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -2145,7 +2145,7 @@ void sqlite3DropTable(Parse *pParse, SrcList *pName, int isView, int noErr){
     }
   }
 #endif
-  if( !pParse->nested && sqlite3StrNICmp(pTab->zName, "sqlite_", 7)==0 ){
+  if( sqlite3StrNICmp(pTab->zName, "sqlite_", 7)==0 ){
     sqlite3ErrorMsg(pParse, "table %s may not be dropped", pTab->zName);
     goto exit_drop_table;
   }

diff --git a/src/where.c b/src/where.c
index bf6b52752fff1af099a025dc4cc5c71963b24a09..220411de2f83658fb2be4fc34d7df1ea6def1ac3 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -2578,7 +2578,6 @@ static int whereKeyStats(
       iGap = 0;
     }else{
       iGap = iUpper - iLower;
-      if( iGap>=aStat[1]/2 ) iGap -= aStat[1]/2;
     }
     if( roundUp ){
       iGap = (iGap*2)/3;
@@ -3119,11 +3118,13 @@ static void bestBtreeIndex(
     ** VALUE and how common that value is according to the histogram.
     */
     if( nRow>(double)1 && nEq==1 && pFirstTerm!=0 && aiRowEst[1]>1 ){
+      assert( (pFirstTerm->eOperator & (WO_EQ|WO_ISNULL|WO_IN))!=0 );
       if( pFirstTerm->eOperator & (WO_EQ|WO_ISNULL) ){
         testcase( pFirstTerm->eOperator==WO_EQ );
         testcase( pFirstTerm->eOperator==WO_ISNULL );
         whereEqualScanEst(pParse, pProbe, pFirstTerm->pExpr->pRight, &nRow);
-      }else if( pFirstTerm->eOperator==WO_IN && bInEst==0 ){
+      }else if( bInEst==0 ){
+        assert( pFirstTerm->eOperator==WO_IN );
         whereInScanEst(pParse, pProbe, pFirstTerm->pExpr->x.pList, &nRow);
       }
     }