From: drh <>
Date: Thu, 8 Jan 2026 18:14:29 +0000 (+0000)
Subject: Merge all the latest trunk changes into the reset-reserve branch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a10cdb663b3c45ebd1b07a6281f921bcbc3e1f4;p=thirdparty%2Fsqlite.git

Merge all the latest trunk changes into the reset-reserve branch.

FossilOrigin-Name: 6e5f1fbaec775db5c5e90b29cfa0820c9f4d560b36c063b504ef55a6c3a65bdc
---

0a10cdb663b3c45ebd1b07a6281f921bcbc3e1f4
diff --cc manifest
index 2c07703237,57040dae8b..eeeb15acc2
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Enhance\sthe\sVACUUM\sINTO\scommand\ssuch\sthat\sif\sthe\starget\sfile\sis\sa\sURI\nwith\sa\sreserve=N\squery\sparameter,\sthen\sthe\sreserve_bytes\svalue\sis\sset\sto\nN\sprovided\sthat\sN\sis\swithin\sthe\sallowed\srange.\s\sThis\scan\seven\sreduce\sthe\nsize\sof\sthe\sreserve,\sall\sthe\sway\sto\szero.\s\sThis\sprovides\sa\sway\sto\sremove\nreserve\sfrom\sa\sdatabase\swithout\shaving\sto\sdo\sa\scomplete\sdump/restore.
- D 2026-01-07T21:19:42.469
 -C Fix\san\soff-by-one\serror\sin\sthe\spage\snumber\sof\sELOG_CKPT_PAGE\slog\nmessages\sin\stmstmpvfs.c
 -D 2026-01-08T17:52:42.103
++C Merge\sall\sthe\slatest\strunk\schanges\sinto\sthe\sreset-reserve\sbranch.
++D 2026-01-08T18:14:29.822
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -2189,11 -2191,8 +2191,8 @@@ F tool/warnings-clang.sh bbf6a1e685e534
  F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
  F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
- P ebedeb6169cc3bc3708130d4061065af600a8851e896fc3eeaf33c8c83fe3b95
- R e7bd6852978f7187c19f7af8715f2c9b
- T *branch * reset-reserve
- T *sym-reset-reserve *
- T -sym-trunk *
 -P 1091f3371f4af75344c2e6da26656c259fa96c8a8da9acde3db79df8aa95fd0a
 -R 35b1dce7128d82186c4ed7ed350ed492
++P 9cec3b67d95c145c968c560e8b3d2c33896b4b5b6c86c61350263764bb616c43 6fafd010de2d9820f77ee6d2a5f0a7ab1260872d09e95b6932c959ef017aaa77
++R 9d283fb18177ce4fdf0022b4cfb348c6
  U drh
- Z 61fb77209c8b97e80b941b8f996389a6
 -Z 095da220d3fdcc217b40575d36e33cc3
++Z b61dc34a2e46333735fdcd406d74e690
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 80be8fc50a,53aa2038fb..7a635bf830
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9cec3b67d95c145c968c560e8b3d2c33896b4b5b6c86c61350263764bb616c43
 -6fafd010de2d9820f77ee6d2a5f0a7ab1260872d09e95b6932c959ef017aaa77
++6e5f1fbaec775db5c5e90b29cfa0820c9f4d560b36c063b504ef55a6c3a65bdc