From: drh <>
Date: Mon, 29 Sep 2025 18:48:00 +0000 (+0000)
Subject: Merge the latest trunk enhancements into the dbstatus-spill branch
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c49ff175ef6d409061e0bc53e53c5a329e833415;p=thirdparty%2Fsqlite.git

Merge the latest trunk enhancements into the dbstatus-spill branch

FossilOrigin-Name: cb604efdb40da95a759e2eeb9d73608859a94acde9d9782ca82757d3a1c15303
---

c49ff175ef6d409061e0bc53e53c5a329e833415
diff --cc manifest
index eda41b88c2,1d754caf1a..767b734bd4
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Include\swrites\sto\stemp\sfiles\sby\ssort\soperations\sin\sthe\sSQLITE_DBSTATUS_SPILL\svalues.
- D 2025-09-25T19:32:29.107
 -C Improve\swhereSolver()\sso\sthat\sit\salways\sfinds\sa\sunique\ssolution.
 -D 2025-09-29T18:17:19.545
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sdbstatus-spill\sbranch
++D 2025-09-29T18:48:00.358
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -653,9 -648,9 +648,9 @@@ F ext/wasm/sql/000-mandelbrot.sql 77533
  F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
  F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555e685bce3da8c3f
  F ext/wasm/test-opfs-vfs.js 1618670e466f424aa289859fe0ec8ded223e42e9e69b5c851f809baaaca1a00c
- F ext/wasm/tester1-worker.html ebc4b820a128963afce328ecf63ab200bd923309eb939f4110510ab449e9814c
- F ext/wasm/tester1.c-pp.html 1c1bc78b858af2019e663b1a31e76657b73dc24bede28ca92fbe917c3a972af2
- F ext/wasm/tester1.c-pp.js aa694096feb5cfd9333f7029e933a4eae95bde5cc3edd29da4dc0f8dae452905
 -F ext/wasm/tester1-worker.c-pp.html 883881eeac14eeeecc8ff22acf9fe0f18a97cacb48be08ebb0bae891ceded584
++F ext/wasm/tester1-worker.c-pp.html 883881eeac14eeeecc8ff22acf9fe0f18a97cacb48be08ebb0bae891ceded584 w ext/wasm/tester1-worker.html
+ F ext/wasm/tester1.c-pp.html 949920126dcf477925d8d540093d9cc374d3ab4c4ddee920c1dcadcf37917306
+ F ext/wasm/tester1.c-pp.js 23fc1223e75228f054148eeb8469ad114e9b2881b9f437fa291b8da06d021ce3
  F ext/wasm/tests/opfs/concurrency/index.html 657578a6e9ce1e9b8be951549ed93a6a471f4520a99e5b545928668f4285fb5e
  F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65ad09f510589c779b7cc6a803a88
  F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
@@@ -743,13 -737,13 +737,13 @@@ F src/random.c 606b00941a1d7dd09c381d32
  F src/resolve.c f8d1d011aba0964ff1bdccd049d4d2c2fec217efd90d202a4bb775e926b2c25d
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
  F src/select.c b95181711d59c36d9789e67f76c4cfec64b99f9629a50be5e6566e117b87d957
- F src/shell.c.in 6ca902bb9aa56ae7f83769b39652b975fd0b347f984ab13f4565de80e4ecb3e9
 -F src/shell.c.in 0ab96b4d875ec03e1b5d0c97aa3f2f68d3b6c926f270488e26f3088d17554811
 -F src/sqlite.h.in 5732519a2acb09066032ceac21f25996eb3f28f807a4468e30633c7c70faae1c
++F src/shell.c.in cfe13eb367679f21eae6534280ca43da5ea8393f89cc1e8b070c9a935ab886e5
 +F src/sqlite.h.in 9fca8150225467bef7a1c378f00f5ef8f795e20cb450df67f82963e62fafcbe3
  F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
  F src/sqlite3ext.h 3f0c4ed6934e7309a61c6f3c30f70a30a5b869f785bb3d9f721a36c5e4359126
- F src/sqliteInt.h 87418f40cbdd986b4a58c649e598fd6cde89e98d3b5c770d2899b5f6c755ebb9
 -F src/sqliteInt.h 673c7c5d7e77552452b21499717233329809f252458f77a798977737f51b31b8
++F src/sqliteInt.h ff99ddb847558f9a087eceb93909fd1e9644f3397fffdcf7a26cc3ffa82b0c78
  F src/sqliteLimit.h fe70bd8983e5d317a264f2ea97473b359faf3ebb0827877a76813f5cf0cdc364
 -F src/status.c 0e72e4f6be6ccfde2488eb63210297e75f569f3ce9920f6c3d77590ec6ce5ffd
 +F src/status.c 34ccabc1bca527e800c1924fb926aa09b5828605c1431a4cf0eb5b8a549982b0
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
  F src/tclsqlite.c 3c604c49e6cf4211960a9ddb9505280fd22cde32175f40884c641c0f5a286036
  F src/tclsqlite.h 614b3780a62522bc9f8f2b9fb22689e8009958e7aa77e572d0f3149050af348a
@@@ -1044,8 -1038,8 +1038,8 @@@ F test/dblwidth-a.sql eb4141518610e52f9
  F test/dbpage.test 63fab1eb026bada121107e53436fa749bbf83281dc9dea17af422f7a5c0f289f
  F test/dbpagefault.test ea39de2ca86041a9c6df1135645180a76d0a8da93ac159e2fafe38e39636530b
  F test/dbstatus.test 4a4221a883025ffd39696b3d1b3910b928fb097d77e671351acb35f3aed42759
 -F test/dbstatus2.test f5fe0afed3fa45e57cfa70d1147606c20d2ba23feac78e9a172f2fe8ab5b78ef
 +F test/dbstatus2.test b9c73a59b6f5abd8de6086550114a3ee3228ef13888756e8f074d9b9264ddbaa
- F test/decimal.test ef731887b43ee32ef86e1c8fddb61a40789f988332c029c601dcf2c319277e9e
+ F test/decimal.test a11b87a2c3294eb4c11b55f3168aeac63d683fa8ada35921a6ec1d511eff7648
  F test/default.test c7124864cded213a3f118bc7e2e26f34b7c36dfa26cf6945cc8b7f5db1191277
  F test/delete.test 2686e1c98d552ef37d79ad55b17b93fe96fad9737786917ce3839767f734c48f
  F test/delete2.test 3a03f2cca1f9a67ec469915cb8babd6485db43fa
@@@ -2175,8 -2169,8 +2169,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 118905b26a96825433f79b47fd3e7c2bdb137d84292fb9419e4436a961a9833a
- R 12194ee4659fc7e61523e3e60d402d56
- U dan
- Z 54bf731d38cd3b8cac77a45a947299fd
 -P 0ad5d77fc0a9d205cc061ee4923d885f6f28f77c1efef3cc10297036ce164e6d
 -R 9d0688a1783d31445cb1e5a298e6561f
++P 4c1118ba40172af61d9304dec7a9c7344566e6a5963a317880ad232bebb40176 ae303dab2f534e2c5132112b61fa5a097e7010fd8b652badee669fbe9df5cf53
++R 8e867532a4eb31d2511af86b87eb92ea
+ U drh
 -Z 7fcc32fcbbfc1112a0376663c5e3564b
++Z 8098974d574c7d6df358efb09ed78cae
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index d66b6b2ff4,e8524ca4f0..0060e551e9
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4c1118ba40172af61d9304dec7a9c7344566e6a5963a317880ad232bebb40176
 -ae303dab2f534e2c5132112b61fa5a097e7010fd8b652badee669fbe9df5cf53
++cb604efdb40da95a759e2eeb9d73608859a94acde9d9782ca82757d3a1c15303