From: drh <>
Date: Tue, 17 Mar 2026 09:53:02 +0000 (+0000)
Subject: Merge trunk enhancements into the idxdelete-tolerance branch
X-Git-Tag: major-release~74^2~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c1f7c259efc934f25762a650084a1e6eba04234;p=thirdparty%2Fsqlite.git

Merge trunk enhancements into the idxdelete-tolerance branch

FossilOrigin-Name: 5f5ab3eb3618b6a2799355df50bfdf94121161f7cadba6253963036d9f284f08
---

1c1f7c259efc934f25762a650084a1e6eba04234
diff --cc manifest
index af73aacf64,b1062ba106..c7c3cd89c7
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Remove\sa\scouple\sof\sunused\svariables.
- D 2026-03-16T19:14:07.782
 -C Enhance\stext&rarr;float\sconversions\sfor\sexact\srounding\sin\sall\scases.
 -D 2026-03-17T09:49:07.391
++C Merge\strunk\senhancements\sinto\sthe\sidxdelete-tolerance\sbranch
++D 2026-03-17T09:53:02.101
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -797,13 -797,13 +797,13 @@@ F src/trigger.c 4bf3bfb3851d165e4404a9f
  F src/update.c 3e5e7ff66fa19ebe4d1b113d480639a24cc1175adbefabbd1a948a07f28e37cf
  F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1
  F src/utf.c 7267c3fb9e2467020507601af3354c2446c61f444387e094c779dccd5ca62165
- F src/util.c 0cb2e590e9dcac6807352017fcbf5a52e0f836d74a338cb8c02ee3162bcf6508
+ F src/util.c cf91389b58590edfb5978199ef59488ef8e3723e1ba1aa0ff15c62f8a658b95f
  F src/vacuum.c d3d35d8ae893d419ade5fa196d761a83bddcbb62137a1a157ae751ef38b26e82
 -F src/vdbe.c 5328c99dd256ee8132383565a86e253543a85daccfd7477c52f20bac6b385a7f
 +F src/vdbe.c 31ca4aaad332c3b973c5fb74bc76972a856fcb99c581e68efc35b6e9299a6d6c
  F src/vdbe.h 966d0677a540b7ea6549b7c4e1312fc0d830fce3a235a58c801f2cc31cf5ecf9
 -F src/vdbeInt.h 42488247a80cd9d300627833c6c85ace067ae5011a99e7614e2358130d62feea
 +F src/vdbeInt.h 68d4adddb1eb48cdbaff8cce1305ac6bc5ad9115f1a37087a13d01a045303e7a
  F src/vdbeapi.c 6cdcbe5c7afa754c998e73d2d5d2805556268362914b952811bdfb9c78a37cf1
 -F src/vdbeaux.c 396d38a62a357b807eabae0cae441fc89d2767a57ab08026b7072bf7aa2dd00c
 +F src/vdbeaux.c f2f97545ace70c7d3171b3a38c6313e59c317916370a74fc82fadf0c924e6e79
  F src/vdbeblob.c b3f0640db9642fbdc88bd6ebcc83d6009514cafc98f062f675f2c8d505d82692
  F src/vdbemem.c 317ec5e870ddb16951b606c9fe8be22baef22ecbe46f58fdefc259662238afb7
  F src/vdbesort.c b69220f4ea9ffea5fdef34d968c60305444eea909252a81933b54c296d9cca70
@@@ -2193,8 -2193,9 +2194,8 @@@ F tool/warnings-clang.sh bbf6a1e685e534
  F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
  F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
- P f928a38091977268aa6a096104797158883ed89b9e026b4e4b98b9b5da967de1
- R 7438db62cdb47dc34d5186c39f71f22d
- U dan
- Z f29b64c0d9855a6b3666cd5d7eeea6d4
 -P 13e2cad810bfd59a9e18eb38bda1241715b76756ffec7d617e9ce99b89f19284 4ab10b251d870af8297b9e505452393f6000f83784c822ff128e7aec06f8c72f
 -R db8308d0c3df23a204d08754ac698c9d
 -T +closed 4ab10b251d870af8297b9e505452393f6000f83784c822ff128e7aec06f8c72f
++P f66cb3dc275d3f31e57576466e697a6c7c5179144babab08d75b624e9846ecc3 704ddfd0df57c2b137af88264df20a540e3f8f114a58ae5e31b40ab8259bb63e
++R 1a6d1a6d80f42677ecead1da6c93305a
+ U drh
 -Z e98267478d6bb8562b872b8867d13830
++Z 4d0938105db2727fa5b7a43131c4525b
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index bedabb14e7,53daf2b8d4..8412866476
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f66cb3dc275d3f31e57576466e697a6c7c5179144babab08d75b624e9846ecc3
 -704ddfd0df57c2b137af88264df20a540e3f8f114a58ae5e31b40ab8259bb63e
++5f5ab3eb3618b6a2799355df50bfdf94121161f7cadba6253963036d9f284f08