Another virtual table fix in NGQP.

FossilOrigin-Name: 2f2ce4167728399cc30bef045aab500940af978c

diff --git a/manifest b/manifest
index dca4b55f115d5db8a8cb3f46825c979e00ec1f0d..731f7bf16113ec4b11cc6e928f535ed3ac18dcd0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sproblems\sin\sthe\svirtual\stable\slogic\sfor\sNGQP.
-D 2013-05-31T17:55:27.487
+C Another\svirtual\stable\sfix\sin\sNGQP.
+D 2013-05-31T18:13:50.522
 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 103ccfa82fa177f755d35f0d48932713857516a1
+F src/where.c e6d80ad378cfdf98b0477248307872dab302bd0b
 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 816f8add7e60de2ef8df4fdac090c244f8dbda39
-R 876fcc7116fcba2a9fe2cf6848606247
+P 23af28e24b8f7ffacd006978b25bab990a43b8c5
+R 77968cfca458e219a6b5161f66e2b4eb
 U drh
-Z 5ce875f360b3d8cc74f8b2b339e3e8e8
+Z 390707269c04791307b06380f248a89b

diff --git a/manifest.uuid b/manifest.uuid
index 3c1f1692933d93d698db6a2f7190c47f4fbd0076..6937c337ca8ffea49f50284820c5cef7adf19fcf 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-23af28e24b8f7ffacd006978b25bab990a43b8c5
\ No newline at end of file
+2f2ce4167728399cc30bef045aab500940af978c
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 833077497b44d7ee7c6a4b0071df0e7f7d9176c1..a83dbae9dcffaf62e618f79413c2c308c5eb84de 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -3024,7 +3024,7 @@ static Bitmask codeOneLoopStart(
     iReg = sqlite3GetTempRange(pParse, nConstraint+2);
     addrNotFound = pLevel->addrBrk;
     for(j=0; j<nConstraint; j++){
-      int iTarget = iReg+j+1;
+      int iTarget = iReg+j+2;
       pTerm = pLoop->aTerm[j];
       if( pTerm->eOperator & WO_IN ){
         codeEqualityTerm(pParse, pTerm, pLevel, j, bRev, iTarget);