From: dan <Dan Kennedy>
Date: Mon, 15 Sep 2025 16:09:54 +0000 (+0000)
Subject: Merge latest trunk with this branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e924087d309aaf588620c63ae36c3a2be240fe1d;p=thirdparty%2Fsqlite.git

Merge latest trunk with this branch.

FossilOrigin-Name: 0bb8c42951ed4fcda60f195b9cc84c80d5b8c0ff77c7517243708f43ba09cfdd
---

e924087d309aaf588620c63ae36c3a2be240fe1d
diff --cc manifest
index 9c6e3a1e4c,6b9e94a1e5..4636f4e633
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Updates\sto\swhere.c\sto\shandle\svtabs\sin\sjoins\smore\ssimilarly\sto\sregular\stables.
- D 2025-09-13T19:23:12.699
 -C Diverse\sinternal\scleanups\sin\sthe\sJS/WASM\spieces.\sA\spotential\sfix\sfor\sa\shypothetical\sdb-close-time\sresource\sleak\sof\sa\ssubset\sof\sautomated\sJS-to-WASM\sfunction\sconversions\sin\sSafari.\sThat\sbrowser\sexposes\sWASM-exported\sfunctions\svia\snullary\swrappers,\swhich\scauses\sa\shandful\sof\sthem\sto\smisbehave\s(not\sclean\sup)\sat\ssqlite3_close_v2()-time.
 -D 2025-09-15T14:11:55.851
++C Merge\slatest\strunk\swith\sthis\sbranch.
++D 2025-09-15T16:09:54.717
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -2175,11 -2174,8 +2175,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 ef3b7be6f2037871f6f1b1944fed3dda28216e7f179080d3be2e2620c031f48c
- R 897d11ff33135df378e9ecdf2ba1caed
- T *branch * vtab-planner-fixes
- T *sym-vtab-planner-fixes *
- T -sym-trunk *
 -P 292866a46948e8d707bd14864fd1b40eec1bd2e22dcd249ec94711b646c8a70b
 -R 3d648bd2f0581cd393c02110c0b966eb
 -U stephan
 -Z cb971779c9e9efb3d18793a17a591051
++P 991383262b0d07ebc79fdb6bed448013cea3a0ac13292d5397dce012b1e6a673 fabbc8b6d184d52a513e80fabd900f578424fc8a8055e3d64fac54b9e28ea18a
++R 9502f6e7264c20624ab1f1c21d99c7f4
 +U dan
- Z 99690642a15232d641aa4de8081ee700
++Z 08204eb82ab90bdace0e9da74500c44d
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 4a46a393a7,76e48d8148..a406a0353d
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 991383262b0d07ebc79fdb6bed448013cea3a0ac13292d5397dce012b1e6a673
 -fabbc8b6d184d52a513e80fabd900f578424fc8a8055e3d64fac54b9e28ea18a
++0bb8c42951ed4fcda60f195b9cc84c80d5b8c0ff77c7517243708f43ba09cfdd