Fix a problem with code generation on LEFT JOIN of tables without an index.

FossilOrigin-Name: 0b1bee92a0d25f409d5a95f484b05ddf10ae945f

diff --git a/manifest b/manifest
index 731f7bf16113ec4b11cc6e928f535ed3ac18dcd0..e78a656654570b6aa229d28fcb8ee01096e6f5a4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Another\svirtual\stable\sfix\sin\sNGQP.
-D 2013-05-31T18:13:50.522
+C Fix\sa\sproblem\swith\scode\sgeneration\son\sLEFT\sJOIN\sof\stables\swithout\san\sindex.
+D 2013-05-31T18:20:52.849
 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 e6d80ad378cfdf98b0477248307872dab302bd0b
+F src/where.c a8bb7f25f61b354bc26fc09df0d1367ba3389f12
 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 23af28e24b8f7ffacd006978b25bab990a43b8c5
-R 77968cfca458e219a6b5161f66e2b4eb
+P 2f2ce4167728399cc30bef045aab500940af978c
+R 0f759a90cbe05948f904b521254c6d0c
 U drh
-Z 390707269c04791307b06380f248a89b
+Z 66b770a6b254520a8bdad94186b27ffc

diff --git a/manifest.uuid b/manifest.uuid
index 6937c337ca8ffea49f50284820c5cef7adf19fcf..d9b24b220e54638077e0479664eadf7918b0e6ad 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2f2ce4167728399cc30bef045aab500940af978c
\ No newline at end of file
+0b1bee92a0d25f409d5a95f484b05ddf10ae945f
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index a83dbae9dcffaf62e618f79413c2c308c5eb84de..4b1d407159f8526c6f2ca850d5419b67931120c3 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -5311,7 +5311,7 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
       if( (pLoop->wsFlags & WHERE_IDX_ONLY)==0 ){
         sqlite3VdbeAddOp1(v, OP_NullRow, pTabList->a[i].iCursor);
       }
-      if( pLevel->iIdxCur>=0 ){
+      if( pLoop->wsFlags & WHERE_INDEXED ){
         sqlite3VdbeAddOp1(v, OP_NullRow, pLevel->iIdxCur);
       }
       if( pLevel->op==OP_Return ){