From: drh <drh@noemail.net>
Date: Wed, 12 Jun 2013 17:55:50 +0000 (+0000)
Subject: Bug fixes in the handling of virtual tables.
X-Git-Tag: version-3.8.0~130^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95ed68df55bce1b194dc6dd5b94dc8ed59506854;p=thirdparty%2Fsqlite.git

Bug fixes in the handling of virtual tables.

FossilOrigin-Name: 25c0f7292a20c0db6ef176966d9987f29c7d73e5
---

diff --git a/manifest b/manifest
index 4944aabb1c..86301aff88 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sall\schanges\sfrom\strunk.
-D 2013-06-12T17:17:45.907
+C Bug\sfixes\sin\sthe\shandling\sof\svirtual\stables.
+D 2013-06-12T17:55:50.456
 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 97f5d9c3a9dfa802d91f7723cd1d782a3ce78e7a
+F src/where.c 568aef7548e2cad24f03b6099f07aa66b2fa269c
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -1095,7 +1095,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c 4d0393bdbe7230adb712e925863744dd2b7ffc5b
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P addd7f466d6ff55f82d907286650c26b06e9397b 24fc9d4438a5615dd20af5419456166df83a72ea
-R 400236daf5743c1455f090bd73116cba
+P f2e15b1974e55373b5819e3b2326653f890f409f
+R 6fa5c9c088caf080e0b4a5ec6cf7a456
 U drh
-Z eafccaa2bb28a08ba2c2409a2846f8df
+Z 738850606e13a26064a82bd0faf55587
diff --git a/manifest.uuid b/manifest.uuid
index 9a98bfb402..86fd19a1a4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f2e15b1974e55373b5819e3b2326653f890f409f
\ No newline at end of file
+25c0f7292a20c0db6ef176966d9987f29c7d73e5
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index abf4ebf56e..5b699a8663 100644
--- a/src/where.c
+++ b/src/where.c
@@ -3211,6 +3211,7 @@ static Bitmask codeOneLoopStart(
     for(j=0; j<nConstraint; j++){
       int iTarget = iReg+j+2;
       pTerm = pLoop->aLTerm[j];
+      if( pTerm==0 ) continue;
       if( pTerm->eOperator & WO_IN ){
         codeEqualityTerm(pParse, pTerm, pLevel, j, bRev, iTarget);
         addrNotFound = pLevel->addrNxt;
@@ -4704,7 +4705,7 @@ static int whereLoopAddOr(WhereLoopBuilder *pBuilder, Bitmask mExtra){
       sSubBuild.pOrderBy = 0;
       sSubBuild.pBest = &sBest;
 
-      for(pOrTerm=pOrWC->a; pOrTerm<pOrWCEnd; pOrTerm++){
+      for(pOrTerm=pOrWC->a; rc==SQLITE_OK && pOrTerm<pOrWCEnd; pOrTerm++){
         if( (pOrTerm->eOperator & WO_AND)!=0 ){
           sSubBuild.pWC = &pOrTerm->u.pAndInfo->wc;
         }else if( pOrTerm->leftCursor==iCur ){