From: stephan <stephan@noemail.net>
Date: Tue, 3 Mar 2026 18:34:59 +0000 (+0000)
Subject: Merge trunk into the opfs-wl branch.
X-Git-Tag: major-release~100^2~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d016fad5a8af19fe6da04f24819922af74aaf472;p=thirdparty%2Fsqlite.git

Merge trunk into the opfs-wl branch.

FossilOrigin-Name: 81bc4b3b6abc19f98d1f3b1065c4b39a42620a0d7abebe98605dca62dd2d6f9a
---

d016fad5a8af19fe6da04f24819922af74aaf472
diff --cc manifest
index 52ed36f06c,4dd41bd07e..7e05ddc666
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C An\sinitial\scopy/paste\sstub\sfor\sexperimenting\swith\susing\sWebLocks\sfor\sa\snew\scopy\sof\sthe\sOPFS\svfs.\sThis\sis\snot\syet\sfunctional,\sor\seven\sloading,\sbut\sneeds\sstashing\sto\savoid\spotential\sloss.
- D 2026-02-27T03:11:40.358
 -C Convert\smany\ssqlite3_realloc()\scalls\sto\ssqlite3_realloc64().
 -D 2026-03-02T17:11:44.720
++C Merge\strunk\sinto\sthe\sopfs-wl\sbranch.
++D 2026-03-03T18:34:59.705
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -603,9 -594,8 +594,9 @@@ F ext/wasm/api/sqlite3-api-worker1.c-pp
  F ext/wasm/api/sqlite3-license-version-header.js 98d90255a12d02214db634e041c8e7f2f133d9361a8ebf000ba9c9af4c6761cc
  F ext/wasm/api/sqlite3-opfs-async-proxy.js 92d6d327a862f1627ff3e88e60fdfea9def06ad539d98929ba46490e64372736
  F ext/wasm/api/sqlite3-vfs-helper.c-pp.js 3f828cc66758acb40e9c5b4dcfd87fd478a14c8fb7f0630264e6c7fa0e57515d
- F ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js 17b16db29e2e0c75d00f675c17710539269e30f853da6bac9044879e298c270f
+ F ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js 2ccf4322f42063aefc150972943e750c77f7926b866f1639d40eec05df075b6e
  F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js 1575ea6bbcf2da1e6df6892c17521a0c1c1c199a672e9090176ea0b88de48bd9
 +F ext/wasm/api/sqlite3-vfs-opfs-wl.c-pp.js 38484644c21b21b97f60979dddd620e47bdba628bde4ae62b6ce8859870e4f85
  F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 88ce2078267a2d1af57525a32d896295f4a8db7664de0e17e82dc9ff006ed8d3
  F ext/wasm/api/sqlite3-vtab-helper.c-pp.js 366596d8ff73d4cefb938bbe95bc839d503c3fab6c8335ce4bf52f0d8a7dee81
  F ext/wasm/api/sqlite3-wasm.c 45bb20e19b245136711f9b78584371233975811b6560c29ed9b650e225417e29
@@@ -2196,11 -2188,9 +2189,8 @@@ F tool/warnings-clang.sh bbf6a1e685e534
  F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
  F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
- P 9174e7dacf867c1f80e73ccf5e0ee7b9e84fbe9f2e53559d06b72206b1cde3c6
- R b825f5f5f6b51df161046dc5b5c20e5a
- T *branch * opfs-wl
- T *sym-opfs-wl *
- T -sym-trunk * Cancelled\sby\sbranch.
 -P 204f25c882832058c3291d4d6a0a6ac2711c081cb91b19feb2cf94a25ed61ecf a391f5646926787fd9a004225ea406b61d20f282c852c0282fd26cada644b601
 -R fd09c97895a4cac92ff79c9e4e8d0ece
 -T +closed a391f5646926787fd9a004225ea406b61d20f282c852c0282fd26cada644b601
 -U drh
 -Z f2554e3cff169f1dfd8e4679b455ef58
++P 372f18ae909bafd7167b70051935832e3107ede72aaeccbf5c042db7ba791912 88dce64242552e7443d9fb496f6f3ad71dc5b4a882ce21b7ef1d5ea4e26f1e61
++R 75fb07a85007c6410c69c66cd4391b75
 +U stephan
- Z 7cdbae53834e92d0f15d611fc35ab500
++Z 42a2789071a18d2bcb63e8ba8c976a45
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index f746549ef5,1ae350648d..cb69ee9652
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 372f18ae909bafd7167b70051935832e3107ede72aaeccbf5c042db7ba791912
 -88dce64242552e7443d9fb496f6f3ad71dc5b4a882ce21b7ef1d5ea4e26f1e61
++81bc4b3b6abc19f98d1f3b1065c4b39a42620a0d7abebe98605dca62dd2d6f9a