Merge trunk changes into this branch.

FossilOrigin-Name: 3bac76a86baae830d4fdc9e4055470d84549fde56b4cf217ebd96cb486554461

diff --cc manifest
index 854f82c84d47c68d3ae21bfb04ac080abbdfbca9,c936f46d6eb61b7a582b18c42ec476bced5a7cec..c35a614f570e20b28c51a8247efc4fa5dd94f03b
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sdocumentation\scomment\sfor\sSQLITE_CHECKPOINT_NOOP.
- D 2025-09-08T14:32:32.174
 -C Improve\sdocumentation\sof\sSQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.
 -D 2025-09-06T15:27:01.079
++C Merge\strunk\schanges\sinto\sthis\sbranch.
++D 2025-09-08T14:40:17.556
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -743,7 -743,7 +743,7 @@@ F src/resolve.c f8d1d011aba0964ff1bdccd
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
  F src/select.c b95181711d59c36d9789e67f76c4cfec64b99f9629a50be5e6566e117b87d957
  F src/shell.c.in 51c8452b3e6b9a0dfa3df853dd16f147e5e4ae2002deb775cf8a2fccf01c3c6c
- F src/sqlite.h.in fc5802897125fcbde28002f835bdab4ee15d00887c9792f6b69a7961a4abb3b1
 -F src/sqlite.h.in e060225b46f67663484dcb1a8d3bfb084b1f8350f9e19a7f9d90c4bcedb6cd3d
++F src/sqlite.h.in 79dd3963888543f3120536608bf51024c93c7eb163a255098ffd569710189781
  F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
  F src/sqlite3ext.h 0bfd049bb2088cc44c2ad54f2079d1c6e43091a4e1ce8868779b75f6c1484f1e
  F src/sqliteInt.h 27c73e48878d31ef230ba867d1f8c3af6aed357fd93ccc605d3f1aae007ea62b
@@@ -2173,8 -2173,8 +2174,8 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 48be3d020cf0c732557b3d956198a1abcab79424be03f447e2bb89f4d68dc8ff
- R 22a72c4d94910c8e62c5c76a51f0577a
 -P 1bb7eaf784687cd877c5c0552bb511659767670259e64bc108e7972e356d3cfc
 -R f0800e32321ff4c2d1c276620d834c12
++P 2b9c495d02724f19ab16612b0e671dfc612f04342222d9901cd0debd08da4cf0 d7b2fb5363203f475887f277aed4a91e5a83440c169a86b3bf1e4fdf130bbaed
++R 2812d107bd7816cef0e6e9da5e6ce373
  U dan
- Z ca2bc409510535e67e326756e9039e49
 -Z ca287400f072acffceb9fb16c223b773
++Z 39018662c5084e192865b8068d934eec
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 853002a842db67fb17d3b343f030993f0c648f27,ad3b410656bc180064dc442fb11775921f9b37e0..385ba8557cb363e0573b08e35f0faff1f75b1b6f
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2b9c495d02724f19ab16612b0e671dfc612f04342222d9901cd0debd08da4cf0
 -d7b2fb5363203f475887f277aed4a91e5a83440c169a86b3bf1e4fdf130bbaed
++3bac76a86baae830d4fdc9e4055470d84549fde56b4cf217ebd96cb486554461

diff --cc src/sqlite.h.in
Simple merge