From: drh <>
Date: Thu, 7 Mar 2024 18:47:28 +0000 (+0000)
Subject: Improved error handling.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fexp-values-clause;p=thirdparty%2Fsqlite.git

Improved error handling.

FossilOrigin-Name: cf2d1ad0365b05bc8bb310a90f66123e2f21ff7fd6a9784f65c75add4c7e7062
---

diff --git a/manifest b/manifest
index 7631151d2a..82c126eb86 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Simplify\sthe\sparser\schanges\son\sthis\sbranch.
-D 2024-03-07T17:11:12.073
+C Improved\serror\shandling.
+D 2024-03-07T18:47:28.960
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -709,7 +709,7 @@ F src/hash.c 9ee4269fb1d6632a6fecfb9479c93a1f29271bddbbaf215dd60420bcb80c7220
 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
-F src/insert.c 0b90d3d515c94cf7ac3c545db94001f8868db095f2e0ba12457498bb72efa2b5
+F src/insert.c fc8603b247e63bda37f0142df0256871458bfa6171fc75501ac20b1c9336bc17
 F src/json.c e2e40760d6689134c3e2ece38c6a496b34ff5e2661a8f238444a119af666fdce
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
@@ -2179,8 +2179,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P c4923f266f061c06560e8801a3328167aa5658b3f51019c3470f16560591ba76
-R 28cf1d9a09242accb7295b9d610d95e8
-U dan
-Z d7279512dab2d857a2b449e19b0bb733
+P 89a6c7b527321f1e824ee8f51b323248b7f0a9d869083c2879f7c4e3ac1931cb
+R 5ee06c3938cceca1d2ecdbd013d5e4f0
+U drh
+Z 2f531ea7e8fe54ce4807ed2d1f0d6eea
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 62b9508a12..0b8557c521 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-89a6c7b527321f1e824ee8f51b323248b7f0a9d869083c2879f7c4e3ac1931cb
\ No newline at end of file
+cf2d1ad0365b05bc8bb310a90f66123e2f21ff7fd6a9784f65c75add4c7e7062
\ No newline at end of file
diff --git a/src/insert.c b/src/insert.c
index b92c006f36..f23dbc1e6d 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -592,7 +592,9 @@ void sqlite3AutoincrementEnd(Parse *pParse){
 static void multiValuesSelect(Parse *pParse, Select *p, int bDel){
   MultiValues *pVal = pParse->pValues;
   sqlite3SelectPrep(pParse, p, 0);
-  if( bDel && p->pWin==0 ){
+  if( pParse->nErr ){
+    /* Do not attempt to continue coding if a prior error has been seen. */
+  }else if( bDel && p->pWin==0 ){
     /* Code this row directly. This is prefered as calling sqlite3Select() 
     ** too many times for a single Parse context leads to excessing realloc()
     ** calls. */