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

Merge recent trunk enhancements into the idxdelete-tolerance branch

FossilOrigin-Name: 9d84fdb7819a9850919e2c1977811bcf514b3baad29eb8cc9fc78451d500c8b6
---

d6965b1dab2e1bef9cb311bd5c26ae21898b20f6
diff --cc manifest
index d5126ed2cc,49428a207c..ac3bf366f0
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sdisplay\sof\sP4_INDEX\svalues\sin\sEXPLAIN\soutput.
- D 2026-03-17T11:26:57.847
 -C Fix\san\sassertion\sfault\sthat\scould\soccur\sin\sRTree\swhen\sgiven\sa\scorrupt\ndatabase.
 -D 2026-03-17T12:07:49.388
++C Merge\srecent\strunk\senhancements\sinto\sthe\sidxdelete-tolerance\sbranch
++D 2026-03-17T12:16:47.706
  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 cf91389b58590edfb5978199ef59488ef8e3723e1ba1aa0ff15c62f8a658b95f
+ F src/util.c 0dbd633bdc509a1c967e4b49b1555820494d936131017634d7dec96c0b8343ce
  F src/vacuum.c d3d35d8ae893d419ade5fa196d761a83bddcbb62137a1a157ae751ef38b26e82
 -F src/vdbe.c 5328c99dd256ee8132383565a86e253543a85daccfd7477c52f20bac6b385a7f
 -F src/vdbe.h 966d0677a540b7ea6549b7c4e1312fc0d830fce3a235a58c801f2cc31cf5ecf9
 -F src/vdbeInt.h 42488247a80cd9d300627833c6c85ace067ae5011a99e7614e2358130d62feea
 +F src/vdbe.c 8442ec7a77cca0b8c465bfcc57b1f548865aec44e8cf16aa21adb6772a2803b5
 +F src/vdbe.h 70e862ac8a11b590f8c1eaac17a0078429d42bc4ea3f757a9af0f451dd966a71
 +F src/vdbeInt.h e876d6c5fd5f2eee4d818d49dabd615c88147a131f773edf5bd329e5b66cd365
  F src/vdbeapi.c 6cdcbe5c7afa754c998e73d2d5d2805556268362914b952811bdfb9c78a37cf1
 -F src/vdbeaux.c 396d38a62a357b807eabae0cae441fc89d2767a57ab08026b7072bf7aa2dd00c
 +F src/vdbeaux.c 2d03037bd7a9e41886d2bfbc94636353e66fec3b79e3c17f5e3d421d43eb338a
  F src/vdbeblob.c b3f0640db9642fbdc88bd6ebcc83d6009514cafc98f062f675f2c8d505d82692
  F src/vdbemem.c 317ec5e870ddb16951b606c9fe8be22baef22ecbe46f58fdefc259662238afb7
  F src/vdbesort.c b69220f4ea9ffea5fdef34d968c60305444eea909252a81933b54c296d9cca70
@@@ -2194,8 -2193,8 +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 03058d73d3a88ab30e874b4231cc5b263b874a577f8bf5189a452d7376e25a47
- R f2a661a323fa447e9ef4d45e92c17764
- U dan
- Z 5f4c13dd3d9c19174dc84f86e2f27471
 -P b459f6ff63325f71d4056dad2ebb536e0d414c973f3c6e167e8f67e94e6f0e2d
 -R bb184015ffe40d514d42157c68150626
++P e717017f0213441da2ef8a9e1f1e88ebfdefa26fc4773711968417c0bd6ebe5f ed29fe973e6cbf291eff6fc582aeb34556ea4f8df105ec61b361e4cdda017e62
++R 5a8ef14681129d08ac81808dc20cddad
+ U drh
 -Z fbfa20b11c4c5ba2c7155c634a7ba929
++Z e90b6df63372c1895e6eeec02a39dd63
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 403408d586,fe69430c98..fb1b01846e
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e717017f0213441da2ef8a9e1f1e88ebfdefa26fc4773711968417c0bd6ebe5f
 -ed29fe973e6cbf291eff6fc582aeb34556ea4f8df105ec61b361e4cdda017e62
++9d84fdb7819a9850919e2c1977811bcf514b3baad29eb8cc9fc78451d500c8b6