From: drh <>
Date: Tue, 4 Nov 2025 22:19:21 +0000 (+0000)
Subject: Merge the latest trunk enhancements into the qrf branch
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=35cc5176e01ef8f943eb8ee08e007008387e69f4;p=thirdparty%2Fsqlite.git

Merge the latest trunk enhancements into the qrf branch

FossilOrigin-Name: bed60e9be6d7f33c9f20dbb98bebdfaa7226a949a8e06691aea4d1e7c1af9507
---

35cc5176e01ef8f943eb8ee08e007008387e69f4
diff --cc manifest
index b8b405b7a2,1ab0e604f5..c3194e7963
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Striving\sfor\sbetter\snames\sfor\sfields\sin\sthe\sspec\sstructure.
- D 2025-10-29T13:03:35.207
 -C Minor\swasm\sbuild\ssimplifications\sand\sextend\sthe\sJS\sbindings\sof\ssqlite3_column/value_text()\ssuch\sthat\sthey\sinclude\sembeded\sNUL\sbytes\sin\stheir\sresult\sstrings\srather\sthan\struncate\sthem\sat\sNUL.\sConsolidate\sthe\sshell.c\sbuild\sflags\sfrom\sthe\scanonical\sand\sautoconf\smakefiles\sinto\sthe\sconfigure\sscript.
 -D 2025-11-04T22:01:55.830
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sqrf\sbranch
++D 2025-11-04T22:19:21.289
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -662,7 -654,7 +658,7 @@@ F ext/wasm/tests/opfs/sahpool/index.htm
  F ext/wasm/tests/opfs/sahpool/sahpool-pausing.js f264925cfc82155de38cecb3d204c36e0f6991460fff0cb7c15079454679a4e2
  F ext/wasm/tests/opfs/sahpool/sahpool-worker.js bd25a43fc2ab2d1bafd8f2854ad3943ef673f7c3be03e95ecf1612ff6e8e2a61
  F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
- F main.mk e402d12e7c0f5cd3150679847c791b84018f72cd18bc96544b91a90a4651bb41
 -F main.mk 29078d11f7545a8fae4347305b164bb4e777b801da16baeb48214014a8d63a06
++F main.mk 609784b9e66d7b39ac74fa1d554a6dd0314347c9124ce3986d1df03f37814ffb
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
  F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@@ -2173,10 -2165,11 +2169,10 @@@ F tool/vdbe-compress.tcl fa2f37ab39b2a0
  F tool/vdbe_profile.tcl 3ac5a4a9449f4baf77059358ea050db3e34395ccf59c5464d29b91746d5b961e
  F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6ddf2700c
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
- F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
+ F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 612326750155ff15c9a73fde938aa035490cdd95b364452c1e6b19b521508dfe
- R 3452c6d9695f9963544bfa0adc8f850c
 -P fb2c931ae597f8d00a37574ff67aeed3eced4e5547f9120744ae4bfa8e74527b 8ac0bf125ddb6cc86a6825dcfe8895559835eca85ef14b5ad489f7c8159462e4
 -R f6a6dc74b61ecf4b92fdf7025309e13a
 -T +closed 8ac0bf125ddb6cc86a6825dcfe8895559835eca85ef14b5ad489f7c8159462e4 Closed\sby\sintegrate-merge.
 -U stephan
 -Z 6979379120c5ced749593cd4e2d1485e
++P 9644e2a8db4d97a85aa7660a1536894ab971abca52fb32f946c01de30eb40de3 cee2e2576f5e91911a019bff025ee6071850c0d75941e8746f10d57b56bd830a
++R 7a237963e314e2fa86b8ba84b370f176
 +U drh
- Z 0c2b15c1da467d14875b4078a5b0ceb1
++Z 6a0f31fe761557cf0f7c976beb78fb3c
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 011ec18956,0ebbe14be0..97edf0a14d
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9644e2a8db4d97a85aa7660a1536894ab971abca52fb32f946c01de30eb40de3
 -cee2e2576f5e91911a019bff025ee6071850c0d75941e8746f10d57b56bd830a
++bed60e9be6d7f33c9f20dbb98bebdfaa7226a949a8e06691aea4d1e7c1af9507