Fix to the logic that disables constraints on virtual tables.

FossilOrigin-Name: 62d382406b28c1347e13114f42215939ddfd7a9d

diff --git a/manifest b/manifest
index 34d692d6a5408508f9ad46f9be300ba58da6c581..432c1a0ab8944dd585a50e1c574d93e6db173a82 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sissue\sthat\swas\scausing\sORDER\sBY\sDESC\sto\scome\sout\sin\sascending\sorder.
-D 2013-06-03T15:34:48.695
+C Fix\sto\sthe\slogic\sthat\sdisables\sconstraints\son\svirtual\stables.
+D 2013-06-03T16:03:16.168
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -289,7 +289,7 @@ F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
 F src/wal.c 436bfceb141b9423c45119e68e444358ee0ed35d
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
-F src/where.c 078c3aeafacf8544bdc733bf6b60d087d9e6346c
+F src/where.c b8a41bcd6a61e560d9c45e4a066d3858a06657d8
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -1093,7 +1093,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 7d91f688815597ff65ec04b7daa21cb9e5d6bf98
-R 47cac5b8ea3311240b582844f809143b
+P 029840124022387a8f6d2e1a685a003688d0ef3a
+R 74a79b344cf1d282ed20a762beed972e
 U drh
-Z d1b03d3fcac2015c05c39b44e5780b67
+Z 4d150a08a0845f1055b728ec84c21984

diff --git a/manifest.uuid b/manifest.uuid
index fa405a84b7a52b4d9916ee578c1280c41e95ee04..8704c41e00682c6d0a0561b6a80914685fe2110d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-029840124022387a8f6d2e1a685a003688d0ef3a
\ No newline at end of file
+62d382406b28c1347e13114f42215939ddfd7a9d
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index d9e33d6058a6c2d475a24c9e3101f2b333ad5deb..3c4b7140cdad4cae7feedad0e9319873dd0c2275 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -4326,7 +4326,7 @@ static int whereLoopAddVirtual(
         pNew->prereq |= pTerm->prereqRight;
         pNew->aTerm[iTerm] = pTerm;
         if( iTerm>mxTerm ) mxTerm = iTerm;
-        if( iTerm<16 && pUsage[i].omit ) pNew->u.vtab.omitMask |= 1<<i;
+        if( iTerm<16 && pUsage[i].omit ) pNew->u.vtab.omitMask |= 1<<iTerm;
         if( (pTerm->eOperator & WO_IN)!=0 ){
           if( pUsage[i].omit==0 ){
             /* Do not attempt to use an IN constraint if the virtual table