From: drh <>
Date: Fri, 9 Aug 2024 18:22:20 +0000 (+0000)
Subject: Merge the error code fix from trunk.
X-Git-Tag: version-3.47.0~239^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f924f0530d8aec93ed9620ee753d58cad5e7d16;p=thirdparty%2Fsqlite.git

Merge the error code fix from trunk.

FossilOrigin-Name: 81dfb8cd5d59ecf974018b03175ddabd11366d2aca0211dc982f7e14ff314d4d
---

8f924f0530d8aec93ed9620ee753d58cad5e7d16
diff --cc manifest
index 3b74d15e9f,1939d75760..e86de56528
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Do\snot\sattempt\sto\suse\sa\scovering\sindex\sbased\spurely\son\scolumns-used\nwhen\sdoing\san\sUPDATE\sor\sDELETE\sof\sa\sWITHOUT\sROWID\stable.\s\sRaise\san\nSQLITE_INTERNAL\serror\sif\sthere\sis\sever\sa\ssituation\swhere\sa\stable\sreference\ncannot\sbe\sconverted\sinto\san\sindex\sreference\swhen\sthe\squery\splanner\sthinks\nthat\sa\scovering\sindex\sis\sappropriate.
- D 2024-08-09T17:09:18.697
 -C Fix\sthe\sinternal\sroutine\ssqlite3ResolveExprListNames()\sso\sthat\sit\sreturns\nSQLITE_OK\sor\sSQLITE_ERROR\sinstead\sof\sWRC_Continue\sor\sWRC_Abort.\s\sWithout\sthis\nfix,\ssome\stimes\sof\sobscure\ssyntax\serrors\send\sup\sreturning\sSQLITE_INTERNAL\nrather\sthan\sSQLITE_ERROR.
 -D 2024-08-09T18:18:11.368
++C Merge\sthe\serror\scode\sfix\sfrom\strunk.
++D 2024-08-09T18:22:20.994
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2204,11 -2204,8 +2204,8 @@@ F vsixtest/vsixtest.tcl 6195aba1f12a5e1
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
--P 7e1dc263051cf50db04643d1a2aa9f91559b2b121859b750ce4446012d5f3c3e
- R a22c0892de474f9ba14db4c65993edff
- T *branch * covering-index-patch
- T *sym-covering-index-patch *
- T -sym-trunk *
 -R c2e409b8bb5a5130f0d0a1d7f8083bf5
++P fae39ae9320c0f4fcc2e3b3baf0a4170ba2b9a04634a0a1fa41dd4918a74b106 9052187efd1f78abd9b285ac94269a3ba4d65b6aa74c9fa34002ee0628c83919
++R 65096613cd2ad24ce9040af4357a3430
  U drh
- Z b1c9594c16be220e78f6cfe69b132d52
 -Z 115f5c56758e5bdc8ade5fed3254bde0
++Z 67de35a44cee14d85982f1f0205afc6b
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 30b7a517ca,e2642285da..6e3b9448bd
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fae39ae9320c0f4fcc2e3b3baf0a4170ba2b9a04634a0a1fa41dd4918a74b106
 -9052187efd1f78abd9b285ac94269a3ba4d65b6aa74c9fa34002ee0628c83919
++81dfb8cd5d59ecf974018b03175ddabd11366d2aca0211dc982f7e14ff314d4d