From: drh <>
Date: Sat, 25 Oct 2025 11:47:04 +0000 (+0000)
Subject: Merge trunk enhancements into the file-info branch.
X-Git-Tag: major-release~41^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f4e66056ac12062e6ca24b54ca657f9eb6fccfbb;p=thirdparty%2Fsqlite.git

Merge trunk enhancements into the file-info branch.

FossilOrigin-Name: 73e1e081e9f7fc0ece98222669d13abde16197f0befc3343246a9e7da7856f02
---

f4e66056ac12062e6ca24b54ca657f9eb6fccfbb
diff --cc manifest
index 5a4cb1b03b,099d1de885..7f370f5134
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Improvements\sto\sthe\sdesign\sof\sthe\s/proc\slock\sanalysis.
- D 2025-10-24T23:12:33.738
 -C Stricter\sassert()\sstatements\son\sunixShmSystemLock().
 -D 2025-10-25T11:37:54.456
++C Merge\strunk\senhancements\sinto\sthe\sfile-info\sbranch.
++D 2025-10-25T11:47:04.114
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -720,8 -720,8 +720,8 @@@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b
  F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06
  F src/os_kv.c fb7ba8d6204197357f1eb7e1c7450d09c10043bf7e99aba602f4aa46b8fb11a3
  F src/os_setup.h 8efc64eda6a6c2f221387eefc2e7e45fd5a3d5c8337a7a83519ba4fbd2957ae2
- F src/os_unix.c ef2cab7e9adf8a9123fedf9570e517bee90afd5c28e0670665077cdcb1ead0eb
 -F src/os_unix.c d822c2749943eb935cd0edfe3430080a9a2c569510eee4d8c81aed08ce03e5fd
 -F src/os_win.c f81a7cffdfe8c593a840895b3f64290714f0186b06302d2c397012252d830374
++F src/os_unix.c ec6d9ea99794f93b5f4a2ca5769f99c71e967741b574ff9debdea5825b5d5bd5
 +F src/os_win.c 5b14841f9c3ab76841c06a4eca20ba3e7747f44253eba9dfd3d918797e753d49
  F src/os_win.h 4c247cdb6d407c75186c94a1e84d5a22cbae4adcec93fcae8d2bc1f956fd1f19
  F src/pager.c 113f9149092ccff6cf90e97c2611200e5a237f13d26c394bc9fd933377852764
  F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8
@@@ -2171,8 -2171,8 +2171,8 @@@ F tool/version-info.c 33d0390ef484b3b1c
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P d7bcc54beb6463501c0559333455bd2a378798b58cb48f35590e9026d07acd2f
- R 8d33f28289c9578897478104576c4047
 -P 86f53a2eb37d8ec98bc9d4c6b00253cc00d798e79c7d409e65d608354a556e19
 -R dcf753e10a96715b1840de9a0d3fab75
++P f2809dd3b266c0a6a6eb4ed62812a907493fb4006d26f8905df7ff2b1ca01a5e ed01ed337c04cce4cdbb6e80628b6f716d537e072b80067bd2bd6c5d18a1454f
++R 7dd67122ca255adb0444f8e501e60504
  U drh
- Z d0703c0dd028be4d90d4623b7127b76b
 -Z 78fddbc0c09532d4fb60b8889bacc776
++Z 4ce899c38987e188b278f4b05ec7c492
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index a299b026e2,62cb49d79a..7c98774d7a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f2809dd3b266c0a6a6eb4ed62812a907493fb4006d26f8905df7ff2b1ca01a5e
 -ed01ed337c04cce4cdbb6e80628b6f716d537e072b80067bd2bd6c5d18a1454f
++73e1e081e9f7fc0ece98222669d13abde16197f0befc3343246a9e7da7856f02