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

FossilOrigin-Name: f98aa940b439c6e4419be9af988c72a8f97eb5713ad684808afea34f3a1415a4

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 4372976e3d8ca31b894d54920bf6610b02651106,ffede026c3eb241be9eed0afb848e849f984f441..1c15ab29578f71d8bd0ca4511a5f9cd7c52635ae
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\sall\sthe\slatest\strunk\senhancements\sinto\sthe\sreuse-schema\sbranch.
- D 2025-04-21T13:08:19.411
 -C Add\stest\scases\sfor\sthe\sNOT\sNULL/IS\sNULL\soptimization\sin\sCHECK\sconstraints\sfix.
 -D 2025-05-06T17:56:32.330
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sreuse-schema\sbranch.
++D 2025-05-06T23:01:40.945
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
  F Makefile.in c3e414df4dc8dfb12f1f6baf129fcb6d18cd0ebd3c9109370fb3fceeeef9a37a
  F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0
- F Makefile.msc 94da7f5adf15c67c7dfd7f2a4a86a03e7a12c5124b73e71aed3a2d66564e41d1
 -F Makefile.msc 0206f28988bb6634c7e8aff05bf6cfa65d6dfe1d2b6bd95160dd99290a83dfc7
++F Makefile.msc 2250e3e432caecbf419b37abffa6b51d1eaef2025402c4af444eea6e5b21377a
  F README.md e28077cfbef795e99c9c75ed95aa7257a1166709b562076441a8506ac421b7c1
  F VERSION 001dea55eb8304ec9130b6b44a32d3fc349f279d45a7e224fc0730c3cb8e2372
  F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
@@@ -61,11 -61,10 +61,11 @@@ F doc/compile-for-unix.md c9dce1ddd4bf0
  F doc/compile-for-windows.md 5141661e783c9ca9e3fd30e813345898712f5c311d71316f183db87038fa28a6
  F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347bb123ce1ea4f
  F doc/jsonb.md ede3238186e3a90bb79d20b2a6a06d0f9429a38e069e9da0efbad0f2ed48b924
 -F doc/lemon.html 89ea833a6f71773ab1a9063fbb7fb9b32147bc0b1057b53ecab94a3b30c0aef5
 +F doc/lemon.html d07243c2ad72ffcc562bddba55795464f0f4cb330f8158dcb30d24badecb8cf7
  F doc/pager-invariants.txt 83aa3a4724b2d7970cc3f3461f0295c46d4fc19a835a5781cbb35cb52feb0577
 +F doc/shared_schema.md 759fc374709fccf4e5d2d0cbd05f8fedd38fb022bdd8a6c5b5f492684c7023b9
  F doc/tcl-extension-testing.md b88861804fc1eaf83249f8e206334189b61e150c360e1b80d0dcf91af82354f5
- F doc/testrunner.md 15583cf8c7d8a1c3378fd5d4319ca769a14c4d950a5df9b015d01d5be290dc69
+ F doc/testrunner.md 5ee928637e03f136a25fef852c5ed975932e31927bd9b05a574424ae18c31019
  F doc/trusted-schema.md 33625008620e879c7bcfbbfa079587612c434fa094d338b08242288d358c3e8a
  F doc/vdbesort-memory.md 4da2639c14cd24a31e0af694b1a8dd37eaf277aff3867e9a8cc14046bc49df56
  F doc/vfs-shm.txt 1a55f3f0e7b6745931b117ba5c9df3640d7a0536f532ef0052563100f4416f86
@@@ -710,7 -709,7 +710,7 @@@ F ext/wasm/tests/opfs/sahpool/sahpool-p
  F ext/wasm/tests/opfs/sahpool/sahpool-worker.js bd25a43fc2ab2d1bafd8f2854ad3943ef673f7c3be03e95ecf1612ff6e8e2a61
  F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702
  F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
- F main.mk 3120969963676a6483d61f28a381c1d674133c228cbda2419c7f6ee9decbceff
 -F main.mk a41fa9e96ef139452d21a9ca5db4561ce053363e04d07da803f5e1cefb44c65e
++F main.mk 6dec93a1b3eeaa9b89fc0856fe8646e92bfca968f46aeb06163cd2fe3bd8b93e
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
  F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@@ -730,8 -729,8 +730,8 @@@ F src/btmutex.c 30dada73a819a1ef5b75837
  F src/btree.c 00fcee37947641f48d4b529d96143e74d056b7afa8f26d61292c90ee59c056b2
  F src/btree.h 18e5e7b2124c23426a283523e5f31a4bff029131b795bb82391f9d2f3136fc50
  F src/btreeInt.h 9c0f9ea5c9b5f4dcaea18111d43efe95f2ac276cd86d770dce10fd99ccc93886
- F src/build.c c8e082c78e6a90602a720664114b704520e1e0cabcdb9eed77e1c3294eb91f3d
 -F src/build.c 67c1db4c5e89a8519fe9b6dafc287f6bc3627696b5b8536dc5e06db570d8c05f
 -F src/callback.c acae8c8dddda41ee85cfdf19b926eefe830f371069f8aadca3aa39adf5b1c859
++F src/build.c 01cab1fda928f6214ca93bc0de87ea7113c10f18c3bc24c3da74f3c2c603d7da
 +F src/callback.c dd68d54c81989e9ba846464ffc5cc122ac83fe6686fabc6cf38d9e0f480c6879
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/date.c 9db4d604e699a73e10b8e85a44db074a1f04c0591a77e2abfd77703f50dce1e9
  F src/dbpage.c fcb1aafe00872a8aff9a7aa0ef7ff1b01e5817ec7bbd521f8f3e1e674ac8d609
@@@ -747,10 -746,10 +747,10 @@@ F src/hash.h 46b92795a95bfefb210f52f0c3
  F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
  F src/insert.c d05934dfab2c5c0c480fc6fd2038f11215661de08ea6ff38d2563216bd555c1b
- F src/json.c d0e1c62a9689018fe5876b1a1eb574e4ab7a40e0928e0e5adda8b3860c70e1b8
+ F src/json.c c84b0f2bae967341d5a035808d21d0619b23b6e054ceac08e7592cd87f04ed4f
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 -F src/main.c 07f78d917ffcdf327982840cfd8e855fd000527a2ea5ace372ce4febcbd0bf97
 +F src/main.c a3f2f92765ace08ec85aaac7982606d38043aa50e03a6178069c02a42429ec4b
  F src/malloc.c 410e570b30c26cc36e3372577df50f7a96ee3eed5b2b161c6b6b48773c650c5e
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2
@@@ -787,15 -786,15 +787,15 @@@ F src/random.c 606b00941a1d7dd09c381d32
  F src/resolve.c 20e1fbe8f840ffc0cd835e33f68a802a22e34faa918d7a269f3de242fda02f99
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
  F src/select.c 1a5956231f7c57571288eaad61e5c37aaf0f3acb5c8a5ea0b896938166b62fa2
- F src/shell.c.in 7d656f79f83c80012b776b4517ee47e17786e8ab0db124bfdcdc1d8adc1a9fb5
 -F src/shell.c.in 2c904da4431fed365e7d5029b8cb2da46cb3e8cf8a09305d1478836a2301ea96
 -F src/sqlite.h.in 22882ddd3a70751aa8864c81993ee4562ed54c2c508b6270f75e223ffee38e1b
++F src/shell.c.in 8163d3750ae942b4c6a9a8af35456a6d1b3157d1a6e5428e6a5ee81effd283e4
 +F src/sqlite.h.in 9a2e0d5be1448eddbe93cc0e06b3ff0354cb5ec12f17e50ea0b4955af61ecd4f
  F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
  F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
 -F src/sqliteInt.h 8b18ed676757ce49df633b603a465655aa105d9862821ffa9296afb189ba564f
 +F src/sqliteInt.h c93a6a2f52137147cc61d5eb2203e586526434e710db29573787d715c2fcc6a1
  F src/sqliteLimit.h 6d817c28a8f19af95e6f4921933b7fbbca48a962bce0eb0ec81e8bb3ef38e68b
 -F src/status.c 0e72e4f6be6ccfde2488eb63210297e75f569f3ce9920f6c3d77590ec6ce5ffd
 +F src/status.c 9adeef15f9b2bd4a72ccd22b1f29e34dea6ca898baf420016332ba7e63f55539
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 -F src/tclsqlite.c 767a11d470b031e85f51b8924a0e8929b2362ff1975aee3474a10eba3c2e0d36
 +F src/tclsqlite.c 834f1708b471fdd3180573bd0b76071e1afe76dbe1300796c35ba7096be6f13f
  F src/tclsqlite.h 65e2c761446e1c9fa0342b7d2612a703483643c8b6a316d12a65b745a4727395
  F src/test1.c 9b54135e5f1352f06b1d23d7c183f124c1f33de6ea8997cd801f0f215c43591d
  F src/test2.c 62f0830958f9075692c29c6de51b495ae8969e1bef85f239ffcd9ba5fb44a5ff
@@@ -855,13 -853,13 +855,13 @@@ F src/update.c 3e5e7ff66fa19ebe4d1b113d
  F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1
  F src/utf.c 3a20cbae9688af4c1e3754cc2520189d00762e37f60c2deb0b303360d166bba6
  F src/util.c 36fb1150062957280777655976f3f9a75db236cb8207a0770ceae8d5ec17fcd3
 -F src/vacuum.c d580ceb395c1ae3d59da41cbfea60683ff7dd2b94ddf4d0f5657620159e2eeb7
 -F src/vdbe.c 0feab5781141acca67bd5de84172fff902304274ec5cfe58609f005b8d160050
 -F src/vdbe.h 31eddcffc1d14c76c2a20fe4e137e1ee43d44f370896fae14a067052801a3625
 +F src/vacuum.c 2310591bdd174c324752d909bb4d628e48ad1ac50f3266b086ab4d7af3123f71
- F src/vdbe.c c3884579fd398e906f3ef6854bddb9917988282589dea7cc31248f03b7ebd2c4
++F src/vdbe.c d26c58ca4b66ef4a494c03fa37a1eac35fa50f12a89f64dd174a846d4f674d1d
 +F src/vdbe.h ba31115371f311763bb138991ca73c953e28facb2db81cbc38fb460d4913687c
  F src/vdbeInt.h 5446f60e89b2aa7cdf3ab0ec4e7b01b8732cd9d52d9092a0b8b1bf700768f784
  F src/vdbeapi.c 28fab30ed0acc981aecfdcaab0a421503609078e29850eb28494816682baf0a7
- F src/vdbeaux.c add2fbdc28ae6ca1d67b56a6f99a6b677052806c2b117f55bae813db8850b04a
 -F src/vdbeaux.c 948c379976885a073b54cc7d8ffda087dc1a1095d1f5bb8df218796f8c933ac3
 -F src/vdbeblob.c b1b4032cac46b41e44b957c4d00aee9851f862dfd85ecb68116ba49884b03dfd
++F src/vdbeaux.c df6f9b8b6a6adbd0d2001aac935bce2e16437d94528ed2d38368121c9bfca379
 +F src/vdbeblob.c cdaded7d7581e4b2fd3f7a40c4bfe542688eb692d00760fcc2206c721681ea19
  F src/vdbemem.c e67d9c6484d868c879d20c70d00bf4a9058082f1d4058607ca15d50eb3aebc21
  F src/vdbesort.c 49e366d0216c782eba287bf602384e4330d2526a22f1275492d2785ce103c79b
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
@@@ -1744,9 -1733,9 +1744,9 @@@ F test/temptable.test d2c9b87a54147161b
  F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d1631311a16
  F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
  F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 -F test/tester.tcl 463ae33b8bf75ac77451df19bd65e7c415c2e9891227c7c9e657d0a2d8e1074a
 -F test/testrunner.tcl 614c4a28f7f730acd7bec53e17d76602fb480e0d538b6ec548169e03a093f92d x
 -F test/testrunner_data.tcl 8d5fa3851c48bc94e26db0be325202e44f6ca4ed838272b8d5b10c23817621e6
 +F test/tester.tcl 34f7785cde1ac74ee36103feb98c95b15d7fa33a0eb07b47bb4a97aecc4e9209
- F test/testrunner.tcl 7136d48d21eae958061463fed3421ffd7486028238bc82672a2458a88d48360d x
- F test/testrunner_data.tcl de001b5967554ca9bc2a766fd70b006a63796eedfcf5bd141d811e0b35bcca9b
++F test/testrunner.tcl 6dc7bff6c6e52c0f798fd2a720b1d667ec50405f2cb5a02cdbfc6c8dcbfe031c x
++F test/testrunner_data.tcl b72df8b4c5ff29f4306b384e7091afa51d5659a889c3e022a8199fb204414cc6
  F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
  F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -2155,8 -2143,7 +2155,7 @@@ F tool/genfkey.README e550911fa984c8255
  F tool/genfkey.test b6afd7b825d797a1e1274f519ab5695373552ecad5cd373530c63533638a5a4f
  F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
  F tool/index_usage.c f62a0c701b2c7ff2f3e21d206f093c123f222dbf07136a10ffd1ca15a5c706c5
- F tool/kvtest-speed.sh 4761a9c4b3530907562314d7757995787f7aef8f
 -F tool/lemon.c f51a488369046cd4f4212d755a214a57673ded400cbeb01e298cbf63539e1d8c
 +F tool/lemon.c 5f999ac3801e8b585149a5fd5c7c2bbdde3baca98985ebe68e1a41b8e19d19a4
  F tool/lempar.c bdffd3b233a4e4e78056c9c01fadd2bb3fe902435abde3bce3d769fdf0d5cca2
  F tool/libvers.c caafc3b689638a1d88d44bc5f526c2278760d9b9
  F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
@@@ -2172,10 -2159,9 +2171,9 @@@ F tool/mkmsvcmin.tcl d76c45efda1cce2d40
  F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef
  F tool/mkopcodeh.tcl 2b4e6967a670ef21bf53a164964c35c6163277d002a4c6f56fa231d68c88d023
  F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
 -F tool/mkpragmatab.tcl 3801ce32f8c55fe63a3b279f231fb26c2c1a2ea9a09d2dd599239d87a609acec
 +F tool/mkpragmatab.tcl 7650ca1297ef7530179c149db50311e9c533c6accd8df3505275529a10e82137
  F tool/mkshellc.tcl 9ce74de0fa904a2c56a96f8d8b5261246bacb0eaa8d7e184f9e18ff94145ebbc
  F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
- F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 351c55256213154cabb051a3c870ef9f4487de905015141ae50dc7578a901b84
  F tool/mksqlite3c.tcl f11b63445c4840509248bd4aa151a81aea25d5415fef71943c8d436eba4f3b3c
  F tool/mksqlite3h.tcl 989948c6a26e188e673d7c2f2f093ea3acd816ad6ac65bab596280075c8f3a45
@@@ -2228,8 -2207,8 +2219,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 e9496b1bbc9232e021795748db1c3c8055c0ab9c47bde2ad41ba6cebddaec5fd ea9acb5573f4d71a314e4467d30477a1d01c8db648985750a42b3c047f404c9c
- R 572ccbaf8f54fa63194b74b71e84ff8b
 -P 2adaee9aa90f280a406007695fbc4a314806584c93d6b62b46c031492b31ec27
 -R 785918686456a4e780990cb7c7171f36
 -U dan
 -Z bab07d1fb4803bf298a1c8473b03d461
++P b3a526a887fd0d45635c76dbd990f32e76933a9d729edeb1fb502085a3608541 6eb2939a6093c0796910645172d80c53055559dd57c012f1dc815d89fbf84447
++R 8f93b19e9c72240a54a47c0da0f2e1b4
 +U drh
- Z 4e946db3b756502335b800c11f13d651
++Z a1668ff7a77653bada711ea98f746871
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index d4e8c3a36dc4ce9fbe6eabd9b5d7cae9379bb42f,dc7c0bb9b5473c46ce5b9dbb2e15018e8c6447dc..ec7ad04f461b2935cf38cec515bd1cccf966a67a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b3a526a887fd0d45635c76dbd990f32e76933a9d729edeb1fb502085a3608541
 -6eb2939a6093c0796910645172d80c53055559dd57c012f1dc815d89fbf84447
++f98aa940b439c6e4419be9af988c72a8f97eb5713ad684808afea34f3a1415a4

diff --cc src/build.c
Simple merge

diff --cc src/shell.c.in
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc test/testrunner.tcl
Simple merge

diff --cc test/testrunner_data.tcl
Simple merge