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

FossilOrigin-Name: a0c3f3d00d035fc9042cd713ec7787684701299d27439f4695de78f4f8f5c4ef

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
index e0a94693101855915e2987f8b4b580e80c79557b,ac0fdb513b4b3ac7602d8c035f87830cbdb43d5d..bdf19744fe9c8ae0b463a8b52c0a68d705ee69e8
--- 1/main.mk
--- 2/main.mk
+++ b/main.mk
@@@ -833,8 -831,7 +832,9 @@@ TESTSRC2 = 
    $(TOP)/src/bitvec.c \
    $(TOP)/src/btree.c \
    $(TOP)/src/build.c \
 +  $(TOP)/src/callback.c \
 +  $(TOP)/src/ctime.c \
+   $(TOP)/src/carray.c \
    ctime.c \
    $(TOP)/src/date.c \
    $(TOP)/src/dbpage.c \

diff --cc manifest
index 8fcb7adc244c189c101076f0bacfb1a3d56c7a3e,002174db2748de027742a9fe07f37e5254ab3080..debc0a6d5e8d12aa53a171ca7af214223f6c81b5
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
 -C Fix\sa\sminor\sover-allocation\sof\sheap\smemory\sin\swal.c.
 -D 2025-10-27T11:39:07.586
 +C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sreuse-schema\sbranch.
- D 2025-09-30T19:56:38.144
++D 2025-10-27T12:20:22.352
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
- F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
+ F LICENSE.md adfb19852dd401741652a7cb51b584608fc340da050072b1b6b5600df7d5938f
  F Makefile.in 3ce07126d7e87c7464301482e161fdae6a51d0a2aa06b200b8f0000ef4d6163b
  F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0
- F Makefile.msc f0ff524e076b2b41d1c562c865df38bb740fcea194600088da29e0bdb01ce282
 -F Makefile.msc 8dd676302f3165984c046f81af14b6676a334418fa30255efaf439f8033042fa
++F Makefile.msc 8af4df541f31ae0b975c8d698cbd6e3af3c82ea8b7eec8b9535ded4fe0c5c363
  F README.md e28077cfbef795e99c9c75ed95aa7257a1166709b562076441a8506ac421b7c1
  F VERSION 16eddb43056a79c1977427ab7a05f3457c373fa159dcdced8754eb89ce7e06b8
  F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
@@@ -47,22 -47,21 +47,22 @@@ F autosetup/find_tclconfig.tcl e64886ff
  F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049
  F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
  F autosetup/proj.tcl ec30c4bc301b6e9eb937655744a7315f863f804fc66400d975bcf9352ac96a1d
- F autosetup/sqlite-config.tcl b274cecb070f7e1b85c87b2e00afb0a3f3a28f373d8cd67d34ba40fa81482be7
+ F autosetup/sqlite-config.tcl 5d779fce20c11fde3fe99d157dcd5b5569d729b301141b8dfb8d5aacf9d48cba
  F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
  F autosetup/teaish/README.txt b40071e6f8506500a2f7f71d5fc69e0bf87b9d7678dd9da1e5b4d0acbf40b1ca
 -F autosetup/teaish/core.tcl aee092fc71986d1272b835ea7492bb55ffc213a289502e4f14da80cf67b7e3c3
 +F autosetup/teaish/core.tcl 1ebbe849d8e716424a3ffe9384c7e8b352b3e1194d3d4a153b125cc5176b3715
  F autosetup/teaish/feature.tcl 18194fb79a24d30e5bbdeab40999616f39278b53a27525349ded033af2fd73be
 -F autosetup/teaish/tester.tcl 1799514c2652db49561b3386c5242b94534d1663f2cfac861a955e071895fdd0
 +F autosetup/teaish/tester.tcl 091745984473faea6985254b9986c6dfd0cce06f68bc515ba4afc1e6b3742fa8
  F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
  F contrib/sqlitecon.tcl eb4c6578e08dd353263958da0dc620f8400b869a50d06e271ab0be85a51a08d3
  F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
  F doc/compile-for-unix.md c9dce1ddd4bf0d25efccc5c63eb047e78c01ce06a6ff29c73e0a8af4a0f4adbc
  F doc/compile-for-windows.md 5141661e783c9ca9e3fd30e813345898712f5c311d71316f183db87038fa28a6
  F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347bb123ce1ea4f
- F doc/jsonb.md ede3238186e3a90bb79d20b2a6a06d0f9429a38e069e9da0efbad0f2ed48b924
+ F doc/jsonb.md acd77fc3a709f51242655ad7803510c886aa8304202fa9cf2abc5f5c4e9d7ae5
 -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 5ee928637e03f136a25fef852c5ed975932e31927bd9b05a574424ae18c31019
  F doc/trusted-schema.md 33625008620e879c7bcfbbfa079587612c434fa094d338b08242288d358c3e8a
@@@ -578,17 -575,17 +576,17 @@@ F ext/session/sessionwor.test 6fd9a2256
  F ext/session/sqlite3session.c b3de195ce668cace9b324599bf6255a70290cbfb5451e826e946f3aee6e64c54
  F ext/session/sqlite3session.h 7404723606074fcb2afdc6b72c206072cdb2b7d8ba097ca1559174a80bc26f7a
  F ext/session/test_session.c 8766b5973a6323934cb51248f621c3dc87ad2a98f023c3cc280d79e7d78d36fb
 -F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 +F ext/wasm/EXPORTED_FUNCTIONS.fiddle 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
- F ext/wasm/GNUmakefile c532444c786b2b5fadb6482b328a193ee93db0e2040e6bbeddf3780b1626d64d
+ F ext/wasm/GNUmakefile 3dc01e673c456d3b752674c9407276e8fef35dec1d304b3cc1de362f019b2a09
  F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a
- F ext/wasm/README.md 66ace67ae98a45e4116f2ca5425b716887bcee4d64febee804ff6398e1ae9ec7
+ F ext/wasm/README.md 2e87804e12c98f1d194b7a06162a88441d33bb443efcfe00dc6565a780d2f259
  F ext/wasm/SQLTester/GNUmakefile e0794f676d55819951bbfae45cc5e8d7818dc460492dc317ce7f0d2eca15caff
  F ext/wasm/SQLTester/SQLTester.mjs 6b3c52ed36a5573ca4883176f326332a8d4c0cecf5efd80489528267fa5d9ed4
  F ext/wasm/SQLTester/SQLTester.run.mjs 57f2adb33f43f2784abbf8026c1bfd049d8013af1998e7dcb8b50c89ffc332e0
  F ext/wasm/SQLTester/index.html 64f3435084c7d6139b08d1f2a713828a73f68de2ae6a3112cbb5980d991ba06f
  F ext/wasm/SQLTester/touint8array.c 2d5ece04ec1393a6a60c4bf96385bda5e1a10ad49f3038b96460fc5e5aa7e536
 -F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-core ef34398a903d0a2425fbbfbd4ed2cd596daea55b8515e2617c8dc7ad7c0767dd
 +F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api c5eaceabb9e759aaae7d3101a4a3e542f96ab2c99d89a80ce20ec18c23115f33
- F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-extras cb4fa8842c875b6ee99381523792975c5ebb7371bd27fbd1bd863a43c7f3505a
+ F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-extras 9eae68943ce91ab145892b31370819c2103525240eb72e0fce53c498b8d8275a
  F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-see fb29e62082a658f0d81102488414d422c393c4b20cc2f685b216bc566237957b
  F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
  F ext/wasm/api/README.md f4c0d67caaee21a77b8938c30b5f79667bfc9d0c95d01b51df77ea35ee773884
@@@ -605,13 -602,13 +603,13 @@@ F ext/wasm/api/sqlite3-api-worker1.c-pp
  F ext/wasm/api/sqlite3-license-version-header.js 0c807a421f0187e778dc1078f10d2994b915123c1223fe752b60afdcd1263f89
  F ext/wasm/api/sqlite3-opfs-async-proxy.js 9654b565b346dc609b75d15337f20acfa7af7d9d558da1afeb9b6d8eaa404966
  F ext/wasm/api/sqlite3-vfs-helper.c-pp.js 3f828cc66758acb40e9c5b4dcfd87fd478a14c8fb7f0630264e6c7fa0e57515d
- F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js f78ba02f7855355513f271d0955a01a7f86a2a8884c278053f578662b2a3b268
- F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 17f172182ff2fd4ad5dc2c2d79aef339b307cb2fa345b0521864baf20262fe6e
+ F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js 26cb41d5a62f46a106b6371eb00fef02de3cdbfaa51338ba087a45f53028e0d0
+ F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 418c33fe284739564daab3c7a7a88882fdd3c99137497900f98eddec1e409af5
  F ext/wasm/api/sqlite3-vtab-helper.c-pp.js 9097074724172e31e56ce20ccd7482259cf72a76124213cbc9469d757676da86
- F ext/wasm/api/sqlite3-wasm.c ff2dc011e17b06186b8b35e408626d7ace69a362b92c197a34d78bef25c7105a
+ F ext/wasm/api/sqlite3-wasm.c dd7fc1d535281f0d5d2732bb1b662d1d403a762f07b63c2ea5663053377b2804
 -F ext/wasm/api/sqlite3-worker1-promiser.c-pp.js bda1c75bd674a92a0e27cc2f3d46dbbf21e422413f8046814515a0bd7409328a
 +F ext/wasm/api/sqlite3-worker1-promiser.c-pp.js c5ac33e39f21a3481812d7333ca6e18853640d423a01960ca8dbc6e7c5c3c21c
- F ext/wasm/api/sqlite3-worker1.c-pp.js fa330c5c9e14277ce85e65c0fdb5d28ee983fcf664d29e23451ac184c1771ec9
- F ext/wasm/c-pp.c 7396bfe57800d54a560702b9379bb9ede2db94af7eabf919b476e8b1d92a2d2f
+ F ext/wasm/api/sqlite3-worker1.c-pp.js 802d69ead8c38dc1be52c83afbfc77e757da8a91a2e159e7ed3ecda8b8dba2e7
 -F ext/wasm/c-pp-lite.c 8fa0148e73782a86274db688c4730e2962cd675af329490493adddaf3322f16f
++F ext/wasm/c-pp-lite.c 8fa0148e73782a86274db688c4730e2962cd675af329490493adddaf3322f16f w ext/wasm/c-pp.c
  F ext/wasm/common/SqliteTestUtil.js 7adaeffef757d8708418dc9190f72df22367b531831775804b31598b44f6aa51
  F ext/wasm/common/emscripten.css 11bd104b6c0d597c67d40cc8ecc0a60dae2b965151e3b6a37fa5708bac3acd15
  F ext/wasm/common/testing.css e97549bab24126c24e0daabfe2de9bb478fb0a69fdb2ddd0a73a992c091aad6f
@@@ -661,7 -658,7 +659,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 5503acd27a8fc0b3f8f202dfae6f05347efe42af12627761b0527ad0b912abac
 -F main.mk 00dd631c66c1f7922b2d691631163899eff1c3d1da780ff37a62f8d997b368e1
++F main.mk 175653345d9571b5ab67f895da953dba90bfc38dc7a15c4d58b5f03ddd16f936
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
  F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@@ -681,17 -678,18 +679,18 @@@ F src/btmutex.c 30dada73a819a1ef5b75837
  F src/btree.c cb5b8ceb9baa02a63a2f83dec09c4153e1cfbdf9c2adef5c62c26d2160eeb067
  F src/btree.h e823c46d87f63d904d735a24b76146d19f51f04445ea561f71cc3382fd1307f0
  F src/btreeInt.h 9c0f9ea5c9b5f4dcaea18111d43efe95f2ac276cd86d770dce10fd99ccc93886
- F src/build.c 2e817598a01dfdd10047e8aae5a56f7df0aedb94fbf8589c5dafe3f7cdd69fff
 -F src/build.c 611e07299d72ff04bbcb9e7109183467e30925d203c3e121ef9bb3cf6876289b
 -F src/callback.c acae8c8dddda41ee85cfdf19b926eefe830f371069f8aadca3aa39adf5b1c859
 -F src/carray.c a6f26cb349ca700d706c0e76d5b2895d76e2a1c392a2b909cf543a0dd4d4d047
++F src/build.c 32e4644d9ea6c29b912013c67ff70c58cb533a68956d0c012c5488452e34e8a4
 +F src/callback.c dd68d54c81989e9ba846464ffc5cc122ac83fe6686fabc6cf38d9e0f480c6879
++F src/carray.c a6f26cb349ca700d706c0e76d5b2895d76e2a1c392a2b909cf543a0dd4d4d047 w ext/misc/carray.c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/date.c e19e0cfff9a41bfdd884c655755f6f00bca4c1a22272b56e0dd6667b7ea893a2
- F src/dbpage.c 081c59d84f187aa0eb48d98faf9578a00bde360f68438d646a86b618653d2479
+ F src/dbpage.c c9ea81c11727f27e02874611e92773e68e2a90a875ef2404b084564c235fd91f
  F src/dbstat.c 73362c0df0f40ad5523a6f5501224959d0976757b511299bf892313e79d14f5c
  F src/delete.c 03a77ba20e54f0f42ebd8eddf15411ed6bdb06a2c472ac4b6b336521bf7cea42
- F src/expr.c aae36a5fbd17e256caf37b03bdaf4d27fd080d83578953c746d542340b37457e
+ F src/expr.c 4d63c8f6d50fe20637de8bdaf57757a0e424e4ac5e2c3313e621d64727a48a1c
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c 928ed2517e8732113d2b9821aa37af639688d752f4ea9ac6e0e393d713eeb76f
- F src/func.c de47a8295503aa130baae5e6d9868ecf4f7c4dbffa65d83ad1f70bdbac0ee2d6
+ F src/func.c 0b802107498048d3dcac0b757720bcb8506507ce02159e213ab8161458eb293b
  F src/global.c a19e4b1ca1335f560e9560e590fc13081e21f670643367f99cb9e8f9dc7d615b
  F src/hash.c 73934a7f7ab1cb110614a9388cb516893b0cf5b7b69e4fd1a0780ac4ce166be7
  F src/hash.h 46b92795a95bfefb210f52f0c316e9d7cdbcdd7e7fcfb0d8be796d3a5767cddf
@@@ -700,8 -698,8 +699,8 @@@ F src/in-operator.md 10cd8f4bcd225a3251
  F src/insert.c dfd311b0ac2d4f6359e62013db67799757f4d2cc56cca5c10f4888acfbbfa3fd
  F src/json.c fb031340edee159c07ad37dbe668ffe945ed86f525b0eb3822e4a67cbc498a72
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
- F src/loadext.c 3326993a09553c6b38cc52d4f9cc2e47dcfc8736ffd853fcb0cb49bc9e3d523c
+ F src/loadext.c a3bc9a2522dc3b960e38b7582d1818f6245a49289387c2c7b19f27bfeabf1e81
 -F src/main.c ce69a2650e3d359ed6a8a2867ccafb27ac62ce1d39f3120a84ff513320952a6c
 +F src/main.c 77c9c5b45ab55d844e8ba3c9b12badfe5edec08621dedc6112d3ba91b06db585
  F src/malloc.c 410e570b30c26cc36e3372577df50f7a96ee3eed5b2b161c6b6b48773c650c5e
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2
@@@ -721,34 -719,34 +720,34 @@@ F src/os.c 509452169d5ea739723e213b8e24
  F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
  F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06
  F src/os_kv.c fb7ba8d6204197357f1eb7e1c7450d09c10043bf7e99aba602f4aa46b8fb11a3
- F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
- F src/os_unix.c b3da55bc4bb214b2bfb1e430b10e9d3ebcf6b11741921ab044c9b9539c8fcc4f
- F src/os_win.c 1307a56ae129a8f55470d97f3213cacb4243062afc81ba2db1e5974694dd7bbc
+ F src/os_setup.h 8efc64eda6a6c2f221387eefc2e7e45fd5a3d5c8337a7a83519ba4fbd2957ae2
+ F src/os_unix.c bbd3ec01b2023bc41b532666533e087feea457c595d1b63284c8acc8929ea7d5
 -F src/os_win.c 27617f334168644b542c9d58ac6e5f051b318136273e78d243384b4eca2df6b3
++F src/os_win.c 086c10843b7a80fc81a206a23b1efbe5271cf1a451b67ff4ea82ee4f67d2adc7
  F src/os_win.h 4c247cdb6d407c75186c94a1e84d5a22cbae4adcec93fcae8d2bc1f956fd1f19
 -F src/pager.c 113f9149092ccff6cf90e97c2611200e5a237f13d26c394bc9fd933377852764
 +F src/pager.c 9e87f4a1ce5a2a9b2077cae352e7cf849950363b984b07626ba5770d0a809891
  F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8
  F src/parse.y 619c3e92a54686c5e47923688c4b9bf7ec534a4690db5677acc28b299c403250
  F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484
  F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
  F src/pcache1.c 131ca0daf4e66b4608d2945ae76d6ed90de3f60539afbd5ef9ec65667a5f2fcd
 -F src/pragma.c ecec75795c1821520266e4f93fa8840cce48979af532db06f085e36a7813860f
 -F src/prepare.c 2af0b5c1ec787c8eebd21baa9d79caf4a4dc3a18e76ce2edbf2027d706bca37a
 +F src/pragma.c feba9d905704facc7584ab930a3460c9f5adf531190cde24c17f92024929839f
 +F src/prepare.c 1b122fb6c5437a0539b924a8ad32e915d2aeb4aa0c85d5b9f0eb23691a6fc6bd
- F src/printf.c 5f0c957af9699e849d786e8fbaa3baab648ca5612230dc17916434c14bc8698f
+ F src/printf.c 7297c2aeed4d90d80c5ba82920d9e57b7bfad04b3466be1d7e042db382fe296e
  F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
  F src/resolve.c f8d1d011aba0964ff1bdccd049d4d2c2fec217efd90d202a4bb775e926b2c25d
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
  F src/select.c b95181711d59c36d9789e67f76c4cfec64b99f9629a50be5e6566e117b87d957
- F src/shell.c.in fe07f06d08a201bd8db603d395151574350c3882a104e86f997d81e2c2dacb48
- F src/sqlite.h.in 75188b8886c9f51dc43341d2b38ac06286fe879b6e751b370c6950589095ef2e
 -F src/shell.c.in e58b0cecf2579c0115253e9c02a44b54fbadf77f4f33b43cfaa48a8274c9aa01
 -F src/sqlite.h.in f7944026ee89ea348f89aec56372d6d25b6cafc1d89df741278d6917e86326a3
++F src/shell.c.in f6f9729fc079a23ecc018f888231326150400ff774fef5c519442fd2a533618a
++F src/sqlite.h.in a70cf705071d1cf038ca51405b5d7d1b3187d51bec92b37ae950bae007132964
  F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
- F src/sqlite3ext.h 3f0c4ed6934e7309a61c6f3c30f70a30a5b869f785bb3d9f721a36c5e4359126
- F src/sqliteInt.h 3038cbfa48c17251996627cb8bf3c599e76e94abb14766d44f3550f0db16a8e0
+ F src/sqlite3ext.h 7f236ca1b175ffe03316d974ef57df79b3938466c28d2f95caef5e08c57f3a52
 -F src/sqliteInt.h 88f7fc9ce1630d9a5f7e0a8e1f3287cdc63882fba985c18e7eee1b9f457f59aa
++F src/sqliteInt.h 1e82af526fc5fcf2249bfd588026364cc30c3236e3b93d2912caafa8ba0a81eb
  F src/sqliteLimit.h fe70bd8983e5d317a264f2ea97473b359faf3ebb0827877a76813f5cf0cdc364
- F src/status.c 9adeef15f9b2bd4a72ccd22b1f29e34dea6ca898baf420016332ba7e63f55539
 -F src/status.c 7565d63a79aa2f326339a24a0461a60096d0bd2bce711fefb50b5c89335f3592
++F src/status.c 426bbfac49c3501675d3c2db63834a29d78e14587695e81327f86689d7eb1593
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 -F src/tclsqlite.c 3c604c49e6cf4211960a9ddb9505280fd22cde32175f40884c641c0f5a286036
 +F src/tclsqlite.c 0b1341fe9e884c6e325461b0330b2dca5720a7bcd63b1553f79cf33d4e1cc990
  F src/tclsqlite.h 614b3780a62522bc9f8f2b9fb22689e8009958e7aa77e572d0f3149050af348a
- F src/test1.c 82d8aab7162a758d030728cab6ae6011785234854b7d6d2aebd877f985d1016a
+ F src/test1.c f880ab766eeedf2c063662bd9538b923fd42c4341b7bfc2150a6d93ab8b9341c
  F src/test2.c 62f0830958f9075692c29c6de51b495ae8969e1bef85f239ffcd9ba5fb44a5ff
  F src/test3.c 432646f581d8af1bb495e58fc98234380250954f5d5535e507fc785eccc3987a
  F src/test4.c 0ac87fc13cdb334ab3a71823f99b6c32a6bebe5d603cd6a71d84c823d43a25a0
@@@ -761,7 -759,7 +760,7 @@@ F src/test_backup.c a2bfd90d2ff2511b863
  F src/test_bestindex.c 3401bee51665cbf7f9ed2552b5795452a8b86365e4c9ece745b54155a55670c6
  F src/test_blob.c 77b994e17f2c87055f44fd96c9a206c5a7155bae2cda2769af60c2f3582f962c
  F src/test_btree.c 28283787d32b8fa953eb77412ad0de2c9895260e4e5bd5a94b3c7411664f90d5
- F src/test_config.c 8b48024b0f240f1824ba801b72048c9a6344109292ee33a8eb7339d1a3689956
 -F src/test_config.c 18aa596d37de1d5968c439fd58ebf38bc4d9c9d1db63621504e241fde375cecd
++F src/test_config.c 4c305aded525c73a42019e7f871b0bb8de781fe0b0137b35ec417176f0d0a2da
  F src/test_delete.c d0e8f6dc55cfc98a7c27c057fb88d512260564bf0b611482656c68b8f7f401ed
  F src/test_demovfs.c 3efa2adf4f21e10d95521721687d5ca047aea91fa62dd8cc22ac9e5a9c942383
  F src/test_devsym.c 649434ed34d0b03fbd5a6b42df80f0f9a7e53f94dd1710aad5dd8831e91c4e86
@@@ -797,30 -794,30 +796,30 @@@ F src/test_vfs.c b4135c1308516adf0dfd49
  F src/test_window.c 6d80e11fba89a1796525e6f0048ff0c7789aa2c6b0b11c80827dc1437bd8ea72
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
- F src/tokenize.c 8400646d2830afc2f2dc465a75e3a92e4bedeea623f19dbd79c0c12d0dd6dda2
+ F src/tokenize.c cb3294cf23c11106b50d9af6998a6c1bf389b52e15b17698c9fab97bbaa9b37f
  F src/treeview.c 3ce7ac9835d2d70cc1c868b01b747ae8a062322e155701e58e3d62ca79aada7a
 -F src/trigger.c d5cf2541ff048f30b6a0507eb3d1ec4e695c53584e3b2298a5bf248714fe185e
 +F src/trigger.c 0c8b2749fcf8a8079c40eb068b1a98758ce6f08b3f245e4f47fde87eb8a17535
  F src/update.c 3e5e7ff66fa19ebe4d1b113d480639a24cc1175adbefabbd1a948a07f28e37cf
  F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1
  F src/utf.c 7267c3fb9e2467020507601af3354c2446c61f444387e094c779dccd5ca62165
  F src/util.c 36fb1150062957280777655976f3f9a75db236cb8207a0770ceae8d5ec17fcd3
 -F src/vacuum.c 1bacdd0a81d2b5dc1c508fbf0d938c89fa78dd8d5b46ec92686d44030d4f4789
 -F src/vdbe.c 92cc9c523cfe11ce117b3bfd8b33846cdb8084bfe3268ba567c95389da6404c8
 -F src/vdbe.h be33bd7b17f2ec92939642416030491508c51071f6c14e27cd195983fec56b63
 +F src/vacuum.c 88d83017713dcaffb306b485bb3d034d17d153c8f7cab210eb2cf5251cb401a3
- F src/vdbe.c 7bc63799b9f5a2f19fc0e84b0eadee81efa029b7153c0a4cbc5b6ecf8a5b32fc
- F src/vdbe.h d8f5ccfedb989db2f72e0aa6c8afdc523316a8fa8e10790668970e460824609a
++F src/vdbe.c cd6d6ff656251898a1c67b22eb707eb63fee65f65ec21bb99fda3a8fb933ca9a
++F src/vdbe.h 8ab4dea122ffdbac918f6acc7a22ac46b29843bc2b53472aab29198f546aaece
  F src/vdbeInt.h 52896dd4d5b62190c53db14b09fc2484434eb594c963df0fa66eb8a94527b02e
- F src/vdbeapi.c f9a4881a9674fec3fa13da35044a1484d3c4b95f9ec891cc8ffb02ef2b7a41df
- F src/vdbeaux.c 84c6d2a8ce1dd3f1747e43b60495b8c55730ee5e8537cc1ad2471354a12319f6
+ F src/vdbeapi.c 869a0da5d855495055f4d35c6ada582f64ce995ce14b26ff9d336274d497266c
 -F src/vdbeaux.c cb907297d03b374544a5a4f81ca981497ff4d09d13838f06de507118367f0b73
 -F src/vdbeblob.c b3f0640db9642fbdc88bd6ebcc83d6009514cafc98f062f675f2c8d505d82692
++F src/vdbeaux.c 323378ae37aebdc643a06ba8057ac15dd64275bb3861a44d066ec7361553b829
 +F src/vdbeblob.c ad7e1db18b53074702ce267f48106c12fb1ac76b54b6eb3aefa4188411eb7c46
  F src/vdbemem.c e67d9c6484d868c879d20c70d00bf4a9058082f1d4058607ca15d50eb3aebc21
- F src/vdbesort.c cb6f472e83ca12c46aa7de0ac0a9d11458b357986f2617a1c90dfb19a542ecbe
- F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
+ F src/vdbesort.c b69220f4ea9ffea5fdef34d968c60305444eea909252a81933b54c296d9cca70
+ F src/vdbetrace.c 49e689f751505839742f4a243a1a566e57d5c9eaf0d33bbaa26e2de3febf7b41
  F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3
 -F src/vtab.c 828221bdbeaaa6d62126ee6d07fd4ec0d09dcaea846f87ad01944d8b7e548859
 +F src/vtab.c 0c2567d6caa2f1df28362eedcd29a2fbc9f4d7a7ff6b13086cc23f4e6ab239c5
  F src/vxworks.h 9d18819c5235b49c2340a8a4d48195ec5d5afb637b152406de95a9436beeaeab
- F src/wal.c a278339ecf5f194fd71fff1f0da1368de50e3a32edc3e9944e1ee1f4610476ff
+ F src/wal.c 6bebee1a33f8b3b656de1bfa529513a2268584562b0bb8ff9c69cefba2506deb
  F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
  F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014
- F src/where.c e499b2f5c307aed80c955718b876684bd9468e3798d9fe6e9c95f3320aff8c9b
 -F src/where.c 7d17cd5cb883b2166097957e20c4aab2d0d98e0c1141002ef77b5f6b9deed844
++F src/where.c cd8b4c80530bbfc7cb02364c5e9e3abbfbf1421c3c31c35b92fcd28a813c67cc
  F src/whereInt.h 8d94cb116c9e06205c3d5ac87af065fc044f8cf08bfdccd94b6ea1c1308e65da
  F src/wherecode.c 71c5c6804b7f882dec8ec858758accae02fcfca13df3cc720f1f258e663ec7c5
  F src/whereexpr.c 403a44eeec1a0f0914fccc6a59376b6924bc00ef6728fe6ffce4cf3051b320fc
@@@ -1701,9 -1691,10 +1702,10 @@@ 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/tester.tcl 34f7785cde1ac74ee36103feb98c95b15d7fa33a0eb07b47bb4a97aecc4e9209
- F test/testrunner.tcl 369c3320051b4295fde68a3dfe9475791703fd949e92f57388f1ffd2bea6f2e0 x
+ F test/testloadext.c 862b848783eaed9985fbce46c65cd214664376b549fae252b364d5d1ef350a27
 -F test/testrunner.tcl 9da764507f6bc752961555c0beb58eb6584b9fb0f989342c7eaab3336380f560 x
 -F test/testrunner_data.tcl c507a9afa911c03446ed90442ffd4a98aca02882c3d51bd1177c24795674def8
++F test/testrunner.tcl 6751d3c182c5e6eb46e6e26ecf5e461dd2c66b7486faa21bbc4fb7b8c93e25ff x
 +F test/testrunner_data.tcl df47fbebcb0214a209f75ef6a681b01a4b1fb2e044661bab7cd27f4980df9444
  F test/testrunner_estwork.tcl 7927a84327259a32854926f68a75292e33a61e7e052fdbfcb01f18696c99c724
  F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
  F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@@ -2181,8 -2171,8 +2183,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 ab7524e1e7f3386ece36de06fcfcf917c29a1d89f0875f670580faa15ac737a4 afb2feb38043fef3c286030f9d1238c132f338e54233f2e4655323b388455c72
- R 8aa78d99b2ea13dc0c22a4fa04cd0bd3
 -P 6ff9ecb89d769bc2a27f8a57130f28ec7478979d3e35ba765c16017b5bdf775d
 -R 4bcc5da65154a62685074a5874c60e20
 -U dan
 -Z b3c584459b21dffccf981eba99e95d81
++P 8959f0e167cc83727d9f4b86ba52a04c25bfe931310482aa1803fc763203de44 1803cb9bb6a13fb66956f729066b6eae64c3a1c0715102fb1a9994e395c12ba9
++R 0b6307d238a0feffe4939d4970d0157d
 +U drh
- Z 3caf6006af28a38123cb63bad3c6a317
++Z b9e8e2b62ea5393ce1eb68821c3517ee
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index effc31ccd88a83b5234273b9035ce47ad0429e78,064022f860a4b2e389025f2690b86457b67767dc..1cc0814de874cb3a7380e978884b20a3f9d025c6
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8959f0e167cc83727d9f4b86ba52a04c25bfe931310482aa1803fc763203de44
 -1803cb9bb6a13fb66956f729066b6eae64c3a1c0715102fb1a9994e395c12ba9
++a0c3f3d00d035fc9042cd713ec7787684701299d27439f4695de78f4f8f5c4ef

diff --cc src/build.c
index 95033e3303f1f25dcec5fc9420c374862ed0e51e,de890c2e91580a506873a6ba54b4136f54c8a882..a5b9ac312eb31cbd39c518a57839d49adf4fd43d
--- 1/src/build.c
--- 2/src/build.c
+++ b/src/build.c
@@@ -453,22 -437,15 +453,27 @@@ Table *sqlite3LocateTable
        if( pMod==0 && sqlite3_strnicmp(zName, "json", 4)==0 ){
          pMod = sqlite3JsonVtabRegister(db, zName);
        }
+ #endif
+ #ifdef SQLITE_ENABLE_CARRAY
+       if( pMod==0 && sqlite3_stricmp(zName, "carray")==0 ){
+         pMod = sqlite3CarrayRegister(db);
+       }
  #endif
 -      if( pMod && sqlite3VtabEponymousTableInit(pParse, pMod) ){
 -        testcase( pMod->pEpoTab==0 );
 -        return pMod->pEpoTab;
 +      if( pMod ){
 +        if( IsSharedSchema(db) && pParse->nErr==0 ){
 +          int bDummy = 0;
 +          pParse->rc = sqlite3SchemaLoad(db, 0, &bDummy, &pParse->zErrMsg);
 +          if( pParse->rc ) pParse->nErr++;
 +          (void)bDummy;
 +        }
 +        if( sqlite3VtabEponymousTableInit(pParse, pMod) ){
 +          Table *pEpoTab = pMod->pEpoTab;
 +          if( pEpoTab ){
 +            assert( IsSharedSchema(db)||pEpoTab->pSchema==db->aDb[0].pSchema );
 +            pEpoTab->pSchema = db->aDb[0].pSchema;  /* For SHARED_SCHEMA mode */
 +          }
 +          return pEpoTab;
 +        }
        }
      }
  #endif

diff --cc src/os_win.c
Simple merge

diff --cc src/shell.c.in
index 44445b75ff61ea408717063d104efc34c1c13cb8,c74681e6437678d58532d9016932e36619b66cb6..72c8b89ebe7feb84c3d9d398b8e438df821bb266
--- 1/src/shell.c.in
--- 2/src/shell.c.in
+++ b/src/shell.c.in
@@@ -5830,20 -5888,9 +5896,19 @@@ static void open_db(ShellState *p, int 
          sqlite3_open(":memory:", &p->db);
          break;
        }
 +      case SHELL_OPEN_READONLY: {
 +        sqlite3_open_v2(zDbFilename, &p->db,
 +            SQLITE_OPEN_READONLY|p->openFlags, 0);
 +        break;
 +      }
 +      case SHELL_OPEN_SHAREDSCHEMA: {
 +        sqlite3_open_v2(p->pAuxDb->zDbFilename, &p->db,
 +          SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE|SQLITE_OPEN_SHARED_SCHEMA,0);
 +        break;
 +      }
        case SHELL_OPEN_UNSPEC:
        case SHELL_OPEN_NORMAL: {
-         sqlite3_open_v2(zDbFilename, &p->db,
-            SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE|p->openFlags, 0);
+         sqlite3_open_v2(zDbFilename, &p->db, p->openFlags, 0);
          break;
        }
      }
@@@ -13647,11 -13501,15 +13795,17 @@@ int SQLITE_CDECL wmain(int argc, wchar_
        data.szMax = integerValue(argv[++i]);
  #endif
      }else if( cli_strcmp(z,"-readonly")==0 ){
-       data.openMode = SHELL_OPEN_READONLY;
+       data.openFlags &= ~(SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE);
+       data.openFlags |= SQLITE_OPEN_READONLY;
 +    }else if( strcmp(z,"-sharedschema")==0 ){
 +      data.openMode = SHELL_OPEN_SHAREDSCHEMA;
      }else if( cli_strcmp(z,"-nofollow")==0 ){
-       data.openFlags = SQLITE_OPEN_NOFOLLOW;
+       data.openFlags |= SQLITE_OPEN_NOFOLLOW;
+     }else if( cli_strcmp(z,"-exclusive")==0 ){  /* UNDOCUMENTED */
+       data.openFlags |= SQLITE_OPEN_EXCLUSIVE;
+     }else if( cli_strcmp(z,"-ifexists")==0 ){
+       data.openFlags &= ~(SQLITE_OPEN_CREATE);
+       if( data.openFlags==0 ) data.openFlags = SQLITE_OPEN_READWRITE;
  #if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_HAVE_ZLIB)
      }else if( cli_strncmp(z, "-A",2)==0 ){
        /* All remaining command-line arguments are passed to the ".archive"
@@@ -13805,11 -13663,15 +13959,17 @@@
        data.szMax = integerValue(argv[++i]);
  #endif
      }else if( cli_strcmp(z,"-readonly")==0 ){
-       data.openMode = SHELL_OPEN_READONLY;
+       data.openFlags &= ~(SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE);
+       data.openFlags |= SQLITE_OPEN_READONLY;
 +    }else if( strcmp(z,"-sharedschema")==0 ){
 +      data.openMode = SHELL_OPEN_SHAREDSCHEMA;
      }else if( cli_strcmp(z,"-nofollow")==0 ){
        data.openFlags |= SQLITE_OPEN_NOFOLLOW;
+     }else if( cli_strcmp(z,"-exclusive")==0 ){  /* UNDOCUMENTED */
+       data.openFlags |= SQLITE_OPEN_EXCLUSIVE;
+     }else if( cli_strcmp(z,"-ifexists")==0 ){
+       data.openFlags &= ~(SQLITE_OPEN_CREATE);
+       if( data.openFlags==0 ) data.openFlags = SQLITE_OPEN_READWRITE;
      }else if( cli_strcmp(z,"-ascii")==0 ){
        data.mode = MODE_Ascii;
        sqlite3_snprintf(sizeof(data.colSeparator), data.colSeparator,SEP_Unit);

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/status.c
index a7634b25e4e2e4b507274c6e16eeb14021786c17,5db67b87b5f64d2ec3342945acb9ad44fcea31a2..a9b3065da0d298ea760c824e95df184c7b2cf62e
--- 1/src/status.c
--- 2/src/status.c
+++ b/src/status.c
@@@ -284,15 -286,13 +286,15 @@@ int sqlite3_db_status64
      /*
      ** *pCurrent gets an accurate estimate of the amount of memory used
      ** to store the schema for all databases (main, temp, and any ATTACHed
-     ** databases.  *pHighwater is set to zero.
+     ** databases.  *pHighwtr is set to zero.
      */
      case SQLITE_DBSTATUS_SCHEMA_USED: {
-       int i;                      /* Used to iterate through schemas */
-       int nByte = 0;              /* Used to accumulate return value */
+       int i;          /* Used to iterate through schemas */
+       int nByte = 0;  /* Used to accumulate return value */
 +      int bReleaseSchema;
  
        sqlite3BtreeEnterAll(db);
 +      bReleaseSchema = sqlite3LockReusableSchema(db);
        db->pnBytesFreed = &nByte;
        assert( db->lookaside.pEnd==db->lookaside.pTrueEnd );
        db->lookaside.pEnd = db->lookaside.pStart;

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbe.h
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/where.c
Simple merge

diff --cc test/testrunner.tcl
Simple merge