Restore fix [f15591f802], which was accidentally clobbered by the stat4 merge.

FossilOrigin-Name: d4b6ad3333cc3bad500c2ebf7a6ea552b6762b69

diff --git a/manifest b/manifest
index c896281d9501e2c8b030d11f7037548ba2dfb3b0..86dc44c7b979c6cb2b0fa2d99e2834e9a1ccf054 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Candidate\sfix\sfor\s[9f2eb3abac]:\sHave\sthe\swhereShortCut()\splanner\signore\sindexes\swith\smore\sthan\sfour\scolumns.
-D 2013-08-29T10:46:05.710
+C Restore\sfix\s[f15591f802],\swhich\swas\saccidentally\sclobbered\sby\sthe\sstat4\smerge.
+D 2013-08-29T14:56:14.988
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -290,7 +290,7 @@ F src/vtab.c 165ce0e797c2cd23badb104c9f2ae9042d6d942c
 F src/wal.c 7dc3966ef98b74422267e7e6e46e07ff6c6eb1b4
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
-F src/where.c dab4d4b8f415e876e5acf63e55f7023fef42316b
+F src/where.c cad6497f79307c2c94aaf72e64866bb33cf99d59
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -1109,7 +1109,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 9229aeb361f9805894321327d05aba855b8799f3
-R cdb2a97ae7b02b85f8d964c7dea1a83c
+P c1152bdcbb5ac185f743015fff63769effa81b4b
+R ef3cf6caed80e05bf3e44c08e4ed05a0
 U dan
-Z 5d34b767de2885354c0587f1fafecb4c
+Z a6b4620a23effa55e7cb7c1762a8f7ee

diff --git a/manifest.uuid b/manifest.uuid
index 1641c63a70fb9f6da8d19f6e71abb41f6246e0db..9346487f5cf700678d7f7a5687069b41ade8b2bd 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c1152bdcbb5ac185f743015fff63769effa81b4b
\ No newline at end of file
+d4b6ad3333cc3bad500c2ebf7a6ea552b6762b69
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index a8584a275fc0fa65a3478de8313454e36dae434d..9e3a72e2d857f7f1a22785744885c7436d2d440c 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -4309,11 +4309,12 @@ static int whereLoopAddBtreeIndex(
     int nIn = 0;
 #ifdef SQLITE_ENABLE_STAT3_OR_STAT4
     int nRecValid = pBuilder->nRecValid;
-    assert( pNew->nOut==saved_nOut );
-    if( (pTerm->wtFlags & TERM_VNULL)!=0 && pSrc->pTab->aCol[iCol].notNull ){
-      continue; /* skip IS NOT NULL constraints on a NOT NULL column */
-    }
 #endif
+    if( (pTerm->eOperator==WO_ISNULL || (pTerm->wtFlags&TERM_VNULL)!=0)
+     && (iCol<0 || pSrc->pTab->aCol[iCol].notNull)
+    ){
+      continue; /* ignore IS [NOT] NULL constraints on NOT NULL columns */
+    }
     if( pTerm->prereqRight & pNew->maskSelf ) continue;
 
     assert( pNew->nOut==saved_nOut );