From: drh <drh@noemail.net>
Date: Tue, 23 Apr 2019 22:00:39 +0000 (+0000)
Subject: Make no atttempt to generate VDBE code for VACUUM after a syntax error.
X-Git-Tag: version-3.29.0~185
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29e780068b7ffde99f105282fd170de8d94af9b3;p=thirdparty%2Fsqlite.git

Make no atttempt to generate VDBE code for VACUUM after a syntax error.

FossilOrigin-Name: 930842470da27d72650033ef2c1df413e70f7c40eb46f91027b35f5ee156af38
---

diff --git a/manifest b/manifest
index c39a5406fc..14d1e9f274 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\sto\sthe\s--hexdb\sdecoder\soption\sin\sthe\sshell\s(and\salso\sin\sthe\sTCL\ntest\scode)\sso\sthat\sit\sworks\son\ssystems\swhere\ssscanf()\sdoes\snot\srecognize\n"%hhx"\sas\swanting\sto\sdelivery\sresults\sinto\sa\scharacter-size\svariable.
-D 2019-04-23T15:30:58.115
+C Make\sno\satttempt\sto\sgenerate\sVDBE\scode\sfor\sVACUUM\safter\sa\ssyntax\serror.
+D 2019-04-23T22:00:39.542
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -589,7 +589,7 @@ F src/update.c 0b973357d88092140531e07ff641139c26fb4380b0b9f5ed98c5f7691b4604d1
 F src/upsert.c 0dd81b40206841814d46942a7337786932475f085716042d0cb2fc7791bf8ca4
 F src/utf.c 2f0fac345c7660d5c5bd3df9e9d8d33d4c27f366bcfb09e07443064d751a0507
 F src/util.c 5061987401c2e8003177fa30d73196aa036727c8f04bf36a2df0c82b1904a236
-F src/vacuum.c 72690ccb6877a88f8473a893cf9f6d7592236f3eebfebfa840b19c708acde574
+F src/vacuum.c 82dcec9e7b1afa980288718ad11bc499651c722d7b9f32933c4d694d91cb6ebf
 F src/vdbe.c 711ef421b3bb3db3b2476067b2dc3c71ef5844d9b1a723026578f89f6da621e8
 F src/vdbe.h 712bca562eaed1c25506b9faf9680bdc75fc42e2f4a1cd518d883fa79c7a4237
 F src/vdbeInt.h 2c12704db9740c8e899786ecfc7a5797a9d067563496eb1b6ed03c592d7b8d90
@@ -1818,7 +1818,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 69bad9257f8db6a2a761bdd298d972eb48d4f845ec11dedc802ba3bafb979915
-R 77b9435054a3e08f2d59227806ec4211
+P 4258e42d92b0113ba59f407197fc24f21734900e5b02952deed07818be3e3e5d
+R 40626349b42f1ecb209e5658c03c5b3b
 U drh
-Z 051f88570fa9bfac9ab4955fc59fefc8
+Z 1ac3dff11ee668e75202966a4ba9668f
diff --git a/manifest.uuid b/manifest.uuid
index 882147fe53..52172c784b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4258e42d92b0113ba59f407197fc24f21734900e5b02952deed07818be3e3e5d
\ No newline at end of file
+930842470da27d72650033ef2c1df413e70f7c40eb46f91027b35f5ee156af38
\ No newline at end of file
diff --git a/src/vacuum.c b/src/vacuum.c
index 74e6d7df37..e8555ef522 100644
--- a/src/vacuum.c
+++ b/src/vacuum.c
@@ -106,6 +106,7 @@ void sqlite3Vacuum(Parse *pParse, Token *pNm, Expr *pInto){
   Vdbe *v = sqlite3GetVdbe(pParse);
   int iDb = 0;
   if( v==0 ) goto build_vacuum_end;
+  if( pParse->nErr ) goto build_vacuum_end;
   if( pNm ){
 #ifndef SQLITE_BUG_COMPATIBLE_20160819
     /* Default behavior:  Report an error if the argument to VACUUM is