Merge the latest trunk enhancements into the reuse-schema branch.

FossilOrigin-Name: 3b485202da8358c4495fd76dae13f739e1206c12fe10b26df719ad1aaccb3401

diff --cc main.mk
Simple merge

diff --cc manifest
index bca6c8497f30e9695cf21fdcd1a898030a4e90f1,dbe9f57581e7ff80d6c73713e32f31b177010728..26d3d8925ba77e2c7cf487f2f08d9aad2a075124
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sreuse-schema\sbranch.
- D 2024-12-24T01:05:30.049
 -C Add\scomment\sto\sthe\scolumnIsGoodIndexCandidate()\sroutine\sto\srecord\sthe\sresults\nof\sa\sfailed\sexperiment.\s\sNo\schanges\sto\scode.
 -D 2025-01-03T11:51:50.103
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sreuse-schema\sbranch.
++D 2025-01-03T15:21:47.659
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@@ -700,7 -699,7 +700,7 @@@ F ext/wasm/tests/opfs/concurrency/test.
  F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
  F ext/wasm/wasmfs.make bc8bb227f35d5bd3863a7bd2233437c37472a0d81585979f058f9b9b503bef35
  F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
- F main.mk aec79f55e7a05f31df6cced31618d9ec9a16e0880e95b6b2a3c96285f5ed3a43
 -F main.mk fde6ef9167ab1972f6273c0cc06a7d2d776f562d06f44f4987868335910f3803
++F main.mk 9cc67df19c97344916ff7d396aa7300e34d723527fcfe6e631a7e6a22aecc2af
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
  F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@@ -841,19 -839,19 +841,19 @@@ F src/test_window.c 6d80e11fba89a179652
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
  F src/tokenize.c fe17e03175cae35b6694d0f879e7bc3d1ddea2fd4ab148cba9bbd025b7a7bb12
- F src/treeview.c 921392561385e05ef5703f20a7a72f0a0a45c1fb749558d7467fae2c3f525006
+ F src/treeview.c d1f3003cb21846828f314a304cf9117f5e80ce0be259315a681d25147004d26d
 -F src/trigger.c 247e2d712d5edc6021d52a169f6ac9a9c10d7144bc4ac7ea06c1ed2aa414659f
 +F src/trigger.c 6736f9cacf8fc0c6ec96637ceeedfeea1cbb7289658a8f304f4b86b7bb301af5
  F src/update.c 0e01aa6a3edf9ec112b33eb714b9016a81241497b1fb7c3e74332f4f71756508
  F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1
  F src/utf.c 8b29d9a5956569ea2700f869669b8ef67a9662ee5e724ff77ab3c387e27094ba
  F src/util.c e5f6a5eeaa26b69054a43bbd0048cfe3d2851f6961052b35aed8f695df922850
 -F src/vacuum.c b763b6457bd058d2072ef9364832351fd8d11e8abf70cbb349657360f7d55c40
 -F src/vdbe.c 8a6eb02823b424b273614bae41579392a5c495424592b60423dd2c443a583df0
 -F src/vdbe.h 9676348d342bd04e21e384c63b57224171ce84fac77853357334ef94c4d33cf4
 +F src/vacuum.c 38577d6f45e10a984720b5219be09ca8649a0e600c2e5c11993900446caca609
 +F src/vdbe.c b0d83eac6537a14fb1d7830a357c96688fe464f750c424efea11c9fc3c017547
 +F src/vdbe.h ce7c8d0f3c7519c809db27b399b322a667b7fa8f4a65ad12c090d3640b4a0850
  F src/vdbeInt.h bf294a0c8fc4cc80779e74b04b8bd82c6e1197b3137cefe0b16cdf002fc7dfd6
  F src/vdbeapi.c 38c252a202d70b56cfb734460bc888ddbd581afec1a10cd4d6c894c9e0b5baea
- F src/vdbeaux.c f996e9cf73145a000cabe087e5521facf7f2b6216068b9fe0070442a1930b6ef
 -F src/vdbeaux.c 5fcbc642a3d3d88c5ea15cadf2c8b8e4e067cb9ff374beb1875c9d209001299e
 -F src/vdbeblob.c 255be187436da38b01f276c02e6a08103489bbe2a7c6c21537b7aecbe0e1f797
++F src/vdbeaux.c 841f28a98bd66982962bb8fa0163bef6787b8870a61c4c6396f9ba8696d7d4c0
 +F src/vdbeblob.c 9e61cd32f3b52bb82d8997f87ecfb0506af1d846f04bfe02d2ac1ab1929692d6
  F src/vdbemem.c df568ef0187e4be2788c35174f6d9b8566ab9475f9aff2d73907ed05aa5684b2
  F src/vdbesort.c d0a3c7056c081703c8b6d91ad60f17da5e062a5c64bf568ed0fa1b5f4cae311f
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
@@@ -863,7 -861,7 +863,7 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c 4e6181d8780ab0af2e1388d0754cbe6f2f04593d2b1ab6c41699a89942fd8997
  F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
  F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014
- F src/where.c fddbca0954ba3ea0e72cc26e983d593c93eabddf6e78ecf7b9d9c7c3a3d66441
 -F src/where.c d519bc93b4a05928f10ba4925b1afc77cbd71c1b1b5148583ab4868925c639fb
++F src/where.c 50fd9886719931b5eadb275601b74c0c2a4c3030a73d70e7d0ec1dd4ad581de9
  F src/whereInt.h 1e36ec50392f7cc3d93d1152d4338064cd522b87156a0739388b7e273735f0ca
  F src/wherecode.c 0c3d3199a2b769a5e2bb70feb5003dc85b3d86842ecaf903a47f2b4205ca5dab
  F src/whereexpr.c 0f93a29cabd3a338d09a1f5c6770620a1ac51ec1157f3229502a7e7767c60b6f
@@@ -2214,8 -2204,8 +2216,8 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P ebbc6752bb50d709505402ff5736890a9970f15498552ecfbf01401b97506c90 286559dfb3ad01fcf34360991a108dbe6bf81e7919c461ada6c691ee8f43868f
- R f782b7cb9b0e94e6a226a0176fb388d7
 -P 1291b013a8c93e7001fe25783bc98d12f5f7c341d1f728e6852632e18a38af58
 -R 0507e66ed59bfa5a55bc14583a9d765f
++P 5149d50f3473f2035fe6a9b0e25e33e58f95149a7a39bd19e678ed4cc7de6ccf 9ee57a30a49d9813bf2669a5d8346f7e018e3fbf1792739951311a8d3a249d45
++R 5d137891c984d64e6aa146cf0d9ebef1
  U drh
- Z 210449dde477f151712781a4a6ad14ef
 -Z 3304d535a779543ccf066c65753e6b08
++Z 3d13110430e8f298320ce67d6396aeee
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 36966b7ec5c278346e25431d85676fd8adbc9f93,d506d57c15678d03f80237ecc3b6ce075b86dd1e..d57996b8acc83a686c747c1b9a45428ab16f60a1
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5149d50f3473f2035fe6a9b0e25e33e58f95149a7a39bd19e678ed4cc7de6ccf
 -9ee57a30a49d9813bf2669a5d8346f7e018e3fbf1792739951311a8d3a249d45
++3b485202da8358c4495fd76dae13f739e1206c12fe10b26df719ad1aaccb3401

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/where.c
Simple merge