From: drh <drh@noemail.net>
Date: Fri, 31 May 2013 19:14:56 +0000 (+0000)
Subject: Do not attempt to generate code in the NGQP if there have been prior errors,
X-Git-Tag: version-3.8.0~130^2~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0edc94dcc71e1f4009b497e42b993387a4ce17e4;p=thirdparty%2Fsqlite.git

Do not attempt to generate code in the NGQP if there have been prior errors,
since with prior errors some of the expressions might not be fully
named resolved.

FossilOrigin-Name: 665e4291c6e78f11d7181c18c5f2418d1adfcb1c
---

diff --git a/manifest b/manifest
index e78a656654..e546c5f58b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\scode\sgeneration\son\sLEFT\sJOIN\sof\stables\swithout\san\sindex.
-D 2013-05-31T18:20:52.849
+C Do\snot\sattempt\sto\sgenerate\scode\sin\sthe\sNGQP\sif\sthere\shave\sbeen\sprior\serrors,\nsince\swith\sprior\serrors\ssome\sof\sthe\sexpressions\smight\snot\sbe\sfully\s\nnamed\sresolved.
+D 2013-05-31T19:14:56.877
 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 a8bb7f25f61b354bc26fc09df0d1367ba3389f12
+F src/where.c 0c1d6feb0c2ffcc3e37b2d0b5ce044773daa3d44
 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 2f2ce4167728399cc30bef045aab500940af978c
-R 0f759a90cbe05948f904b521254c6d0c
+P 0b1bee92a0d25f409d5a95f484b05ddf10ae945f
+R 3775b32a7236de56bac48d67633687ab
 U drh
-Z 66b770a6b254520a8bdad94186b27ffc
+Z ab504bcb48497c438de08e5ddd0f5c9c
diff --git a/manifest.uuid b/manifest.uuid
index d9b24b220e..ca22f8fcd8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0b1bee92a0d25f409d5a95f484b05ddf10ae945f
\ No newline at end of file
+665e4291c6e78f11d7181c18c5f2418d1adfcb1c
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index 4b1d407159..aee574a23a 100644
--- a/src/where.c
+++ b/src/where.c
@@ -5162,6 +5162,10 @@ WhereInfo *sqlite3WhereBegin(
     }
   }
 #endif
+  WHERETRACE(("*** Optimizer Finished ***\n"));
+  if( pParse->nErr || db->mallocFailed ){
+    goto whereBeginError;
+  }
 
 #if 0  /* FIXME: Add this back in? */
   /* If the caller is an UPDATE or DELETE statement that is requesting