Merge all the latest trunk enhancements and fixes into the reuse-schema branch.

FossilOrigin-Name: b974acea28f77ffa7e80f641733966d004641fa8e7971ace9b332d706acd8dd4

diff --cc manifest
index 7be9cb05cecd3385e4fa3edd8890067ccd24881e,591f3cc24732142086c1062b33febda447d7221a..0657e7ca6d8d22ab484027d02dcd8cd28d6e01e3
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\strunk\senhancements\sinto\sthe\sreuse-schema\sbranch.
- D 2026-04-22T20:02:56.390
 -C Strengthen\sthe\sstatement\sabout\snot\saccepting\sagentic\scode.
 -D 2026-05-22T17:51:15.016
++C Merge\sall\sthe\slatest\strunk\senhancements\sand\sfixes\sinto\sthe\sreuse-schema\sbranch.
++D 2026-05-23T11:26:44.879
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -6,8 -7,8 +7,8 @@@ F AGENTS.md 44ddfb38ef23e277888bd70ae37
  F LICENSE.md 6bc480fc673fb4acbc4094e77edb326267dd460162d7723c7f30bee2d3d9e97d
  F Makefile.in 5fda086f33b144da08119255da1d2557f983d0764a13707f05acf0159fd89ba5
  F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0
 -F Makefile.msc 6f4294982758b5eeeac740c1a263186c3fcb9ba51d1b48261e321bcb37a41dbb
 +F Makefile.msc be7092c21713cdbfc6f03d8812e421cb00a9e9d82fa96867e956d6482a23e4ae
- F README.md e4f1a030f813c2fafc898c66d4f10bff2c75eb1a8f504eb9ad9a5ef80e3ff814
+ F README.md f00091ffb5c6379b783afb57ca5f443a5742e119082f37c407f64a5e16c56346
  F VERSION 99cf3be5f13d091183e4314b7fc2e0c0e69accfbe64608b45a313338bbdd7b62
  F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
  F art/icon-80x90.gif 65509ce3e5f86a9cd64fe7fca2d23954199f31fe44c1e09e208c80fb83d87031
@@@ -46,13 -47,13 +47,13 @@@ F autosetup/cc.tcl c0fcc50ca91deff8741e
  F autosetup/find_tclconfig.tcl e64886ffe3b982d4df42cd28ed91fe0b5940c2c5785e126c1821baf61bc86a7e
  F autosetup/jimsh0.c 740dc8cbfaedaff1f27b54b32e0015b22fa6c1a439492b9795968d61e56bab75
  F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
- F autosetup/proj.tcl ce301197f364f7ce2acabbbd84b43d19e917ec73653157ca134a06f32d322712
- F autosetup/sqlite-config.tcl 8fecce2838b7e7d990d161d08998034f3e3b0b2ddf4d7a99dbfafba9c902e302
+ F autosetup/proj.tcl 67683f214977a416baafc4c1020f9940ff047a7306b2292c5872d6287460b7d5
+ F autosetup/sqlite-config.tcl 2205b8bcc193a5d46584ebc1cf44c7a93a977d155e20dc38b18dcce720e58074
  F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
  F autosetup/teaish/README.txt b40071e6f8506500a2f7f71d5fc69e0bf87b9d7678dd9da1e5b4d0acbf40b1ca
 -F autosetup/teaish/core.tcl e014dd95900c7f9a34e8e0f460f47e94841059827bce8b4c49668b0c7ae3f1a0
 +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
@@@ -573,11 -575,10 +576,11 @@@ F ext/session/sessionrowid.test 85187c2
  F ext/session/sessionsize.test 8fcf4685993c3dbaa46a24183940ab9f5aa9ed0d23e5fb63bfffbdb56134b795
  F ext/session/sessionstat1.test 5e718d5888c0c49bbb33a7a4f816366db85f59f6a4f97544a806421b85dc2dec
  F ext/session/sessionwor.test 6fd9a2256442cebde5b2284936ae9e0d54bde692d0f5fd009ecef8511f4cf3fc
- F ext/session/sqlite3session.c 871d8a4574bfc682ca0816efb55c85c5fea048e0becf9367a4b271d6a4474b2f
- F ext/session/sqlite3session.h 063e7bf7be2fff874456f452a224b5b3013b25682d108933b0351c93a1279b9c
- F ext/session/test_session.c 2a02a68b522e2f3d4a64b2a4733af54b0f3e500769aeccd5bcbdd440103db069
+ F ext/session/sqlite3session.c 9d1cce13a48d821a31b36d99123ab25da87c3ae8b3bb96a926dfcc233a35ba9c
+ F ext/session/sqlite3session.h ca7c4422c1514a95056cc8d333217df6b1829d39058126b1de85d10cd62d7a9c
+ F ext/session/test_session.c 05c1f90c04de5474158bf8f7712a6f7a1d47477ce0402bbe0e55fc4a9ef1f49b
 +F ext/wasm/EXPORTED_FUNCTIONS.fiddle 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
- F ext/wasm/GNUmakefile 68c750f173106d9d63f12c1edf1256c6f4bad9894b155da5db64322f4912de4b
+ F ext/wasm/GNUmakefile 65feef4ec48e62249f90278c4c08a3fe3c69e2461ff560b61c03cd73606e0949
  F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a
  F ext/wasm/README.md 2e87804e12c98f1d194b7a06162a88441d33bb443efcfe00dc6565a780d2f259
  F ext/wasm/SQLTester/GNUmakefile e0794f676d55819951bbfae45cc5e8d7818dc460492dc317ce7f0d2eca15caff
@@@ -597,13 -597,13 +600,13 @@@ F ext/wasm/api/post-js-header.js f35d2d
  F ext/wasm/api/pre-js.c-pp.js d6bf82f83f60caa2904bddb95a29cb738b310f672d2796cdc5fe54463ab0d6cd
  F ext/wasm/api/sqlite3-api-glue.c-pp.js 31a721ada7225838a61310a9f3f797fa5275353f8e9b0ae769d85b437be061f5
  F ext/wasm/api/sqlite3-api-oo1.c-pp.js 35e4727010f15fd72ead0dd1eb4e3c2c9bb1cc60e51544cbdff1f7c14f209de2
- F ext/wasm/api/sqlite3-api-prologue.js 29ca376ff5d5f189714cf10b2b93b136e91b06ec8616579b53b2af9dfb4796bf
+ F ext/wasm/api/sqlite3-api-prologue.js 0084e15d66fbcd75cacbaa58e3b473d5e57082c30f3122be7fdadff5589cf6b6
  F ext/wasm/api/sqlite3-api-worker1.c-pp.js 1fa34e9b0e3b90a8898e4f700d7125e44c81877f182627bb8564b97989bc6e78
  F ext/wasm/api/sqlite3-license-version-header.js 98d90255a12d02214db634e041c8e7f2f133d9361a8ebf000ba9c9af4c6761cc
 -F ext/wasm/api/sqlite3-opfs-async-proxy.c-pp.js 25e31482b04293a33d7599f1459eb552b3eb36ca10c02c816122d3308bf80cb2
 +F ext/wasm/api/sqlite3-opfs-async-proxy.c-pp.js 3f85af55609f1452b29c476e59893cbeed417c59560795f50911318e916083b1
  F ext/wasm/api/sqlite3-vfs-helper.c-pp.js 3f828cc66758acb40e9c5b4dcfd87fd478a14c8fb7f0630264e6c7fa0e57515d
  F ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js 27fb135ba3b805b66c90a7333b56080345bf1db79335c3e48b6d01ad7aa09607
- F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js 1c742ed92c0515c8ef97d2b132feb01168252bfd847fed5d52607d8a42d23c6a
+ F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js 4325cb9a5ebfbff7cd3060e309b167116a2a1bcb9f8d69dd8e6d023dbdd783bb
  F ext/wasm/api/sqlite3-vfs-opfs-wl.c-pp.js 3dbd918ef037cd8fa9c7b4dccb3c8637b228638654c429e7df6acab5981c75e2
  F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 3da8fe72dc9e76614a9c102b92e777ce03f81d788b607701c828d8fcbac44b06
  F ext/wasm/api/sqlite3-vtab-helper.c-pp.js 366596d8ff73d4cefb938bbe95bc839d503c3fab6c8335ce4bf52f0d8a7dee81
@@@ -671,18 -671,18 +674,18 @@@ F mptest/multiwrite01.test dab5c5f8f953
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 1b9c24374a85dfc7eb8fa7c4266ee0db4f9609cceecfc5481cd8307e5af04366
  F sqlite3.pc.in e6dee284fba59ef500092fdc1843df3be8433323a3733c91da96690a50a5b398
- F src/alter.c c9d79e9be79931cf56d79facd1be80bbaf07399b2cc553bce05a249f6c327cf4
 -F src/alter.c d7cbe4332a7a2c3a21ab58ee2609efade493f6ae78254613ada0759898629ee3
 -F src/analyze.c 03bcfc083fc0cccaa9ded93604e1d4244ea245c17285d463ef6a60425fcb247d
 -F src/attach.c c58278c7d2d954785591c4fde81669ec3e4d52f348c453b028a19ae8adf4f338
++F src/alter.c 1aa2fa20836fc8a812cf4f32e8f00e7b29a3909bf42c1bf4c281c35c723dd659
 +F src/analyze.c cad85c559c13633e249023f081202f2dd22355cf00d8f384bc22528810e8f593
- F src/attach.c 4e1f68b6188268270fcab10ac24f7832af52ae4ba5cdabf42616375dfd42652c
- F src/auth.c ebec42df26b34a62b6750d30d9c2c03554a1c522020182476f7729a439fef04f
- F src/backup.c 5c97e8023aab1ce14a42387eb3ae00ba5a0644569e3476f38661fa6f824c3523
++F src/attach.c a2a684e97207259d94d2850e31879de0952c265fe98b5bc6fab72adbba1cf846
+ F src/auth.c b5ece4e1edccad082c0332fa0087df225473bae0feea9269f824312201377185
+ F src/backup.c 6ebe22ccbedfcb92423833992130e8d65824be4e6599c3a03f540ab38fc7d13c
  F src/bitvec.c e242d4496774dfc88fa278177dd23b607dce369ccafb3f61b41638eea2c9b399
  F src/btmutex.c 30dada73a819a1ef5b7583786370dce1842e12e1ad941e4d05ac29695528daea
- F src/btree.c 216ffbe197e330118a2999adc7d3f09b0e2eeb163df8746ba9a2b27fed3d4335
+ F src/btree.c 8aa7c903ef0181ff92c8365545ae75a1d648f57151b60c03c11b0a51da979edb
  F src/btree.h e823c46d87f63d904d735a24b76146d19f51f04445ea561f71cc3382fd1307f0
  F src/btreeInt.h 9c0f9ea5c9b5f4dcaea18111d43efe95f2ac276cd86d770dce10fd99ccc93886
- F src/build.c 113bfd3f7614b29a2455192050e3981d26800625b7f245c9d6c7611ae1497a45
 -F src/build.c 866e584cdf40fbc83f530af9fd4d0991582a6fdbd8a9911b7cdbbea5f26a4a9e
 -F src/callback.c 3605bbf02bd7ed46c79cd48346db4a32fc51d67624400539c0532f4eead804ad
++F src/build.c 0a7a5f508236fe805f023ca699e1d368a9e2ce3d613ae5e044fbcd524c94c309
 +F src/callback.c 9942c75ac062c57e69072fe350fcba9e28699c36ed8cf63cf850ca2378293269
  F src/carray.c 3efe3982d5fb323334c29328a4e189ccaef6b95612a6084ad5fa124fd5db1179
  F src/complete.c f216b970ce99c5a657556cf1f17e7ddd494515d3beb63df426bf59ff43bd3d9a
  F src/date.c 61e92f1f7e2e88e1cd91e91dc69eb2b2854e7877254470f9fabd776bfac922b8
@@@ -698,11 -698,11 +701,11 @@@ F src/hash.c 03c8c0f4be9e8bcb6de65aa26d
  F src/hash.h 46b92795a95bfefb210f52f0c316e9d7cdbcdd7e7fcfb0d8be796d3a5767cddf
  F src/hwtime.h 21c2cf1f736e7b97502c3674d0c386db3f06870d6f10d0cf8174e2a4b8cb726e
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 77aa90e7ddbebf131c5de504854b5a61c25b11d53580649fb375b23752793651
- F src/json.c 5027b856cd9b621dc9ba66b211e21a440ccdc63cefdefb44c51e7d3ac550d1a4
+ F src/insert.c 8dbc22f6ddcc5f0af3abf11daeb89b1978f00059cda15ebc61251fa7724fc7ee
+ F src/json.c fadf5f0a00c1af99dbc6ac78dd3c2064c40bb28e602a5746f7c66c1ec8cbb006
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 78d5b06f18996ffa1203129b28fea043f63a87a4117539678f1d761c30b4ff65
 -F src/main.c 6180079f53ccdd784df2eddc3751f49ea7153c5959bee792b19ad9f4bdbcf437
 +F src/main.c e007f0b39137b3e4eeef125b5d6302a8c14a571d5ac12c5b3609c09a517b77e9
  F src/malloc.c 422f7e0498e1c9ef967f06283b6f2c0b16db6b905d8e06f6dbc8baaa3e4e6c5a
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2
@@@ -723,33 -723,33 +726,33 @@@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b
  F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06
  F src/os_kv.c e7d96727db5b67e39d590a68cc61c86daf4c093c36c011a09ebfb521182ec28d
  F src/os_setup.h 8efc64eda6a6c2f221387eefc2e7e45fd5a3d5c8337a7a83519ba4fbd2957ae2
- F src/os_unix.c a07dce662f6c4e18098f6faa9f7ec7cf311f56ee9151bed2aad4dcd55852c9e2
- F src/os_win.c 8262eab29c5b5e6ac204eb6e9639bb1c4d02983a38584399f73b127b0fbbf0ba
- F src/os_win.h 5e168adf482484327195d10f9c3bce3520f598e04e07ffe62c9c5a8067c1037b
+ F src/os_unix.c 83759942d1ea8d59daed50901c123016f845fada74caf3496b8a2537c9a08838
 -F src/os_win.c 8df4b34ec6a08616a7ac33164999524ef773fa359d39ae9ae0e7e1ae4f167440
++F src/os_win.c dc22fa8901d5d721e97ee11f4e1fdf974d4afccc77ae5194139c86c47eca51e3
+ F src/os_win.h c06ccc3a090cf54202ea58981c298817f3309d4c9e4d52ad0a02927346493721
 -F src/pager.c fbec9063ea139dfa5d94ce540671752b89f8e8dc38f8a1f614bab1aa04a2dd40
 +F src/pager.c d47ef44a7e5ad1da936f19f7f9a0f8f17e5dca997758e27e905d50bc65754d36
  F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8
- F src/parse.y 8c8003a932f6f98ac612fd239d3cdc7ca64480f61ca5f4f680c4fe69b1bc68c9
+ F src/parse.y d5a3c5b0277a441c38b35071c05e2b61ff5fc918a63309c809f4b6706179c320
  F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484
  F src/pcache.h 092b758d2c5e4dabb30eae46d8dfad77c0f70b16bf3ff1943f7a232b0fe0d4ba
  F src/pcache1.c 131ca0daf4e66b4608d2945ae76d6ed90de3f60539afbd5ef9ec65667a5f2fcd
 -F src/pragma.c 789ef67117b74b5be0a2db6681f7f0c55e6913791b9da309aefd280de2c8a74d
 -F src/prepare.c 084a037fd3810cb7ffbfc001cd58c0ffac68ba36598a5084b55ea2a090014ebd
 +F src/pragma.c 16bfe475bb6bcc14eb9dbb2847fec6383fb7361fc4cd23b390e3e10daf089bd7
- F src/prepare.c 40312476d751aa775fc7de9620c3b6fe42b268f3f49f832eb8c27588a7dd9cbe
- F src/printf.c 50be92de0725e88c8b38978775ab46f9b42d74e21f65045c3423503173eb0566
++F src/prepare.c e8068198fe52a0e01584981dc74d35b0b6380ed1cac9fdce6f0629b01fe34450
+ F src/printf.c 2bc09ee91d69c709528575bbbee2199e16d6a7e68e1508ac7cf998a7289170ca
  F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
- F src/resolve.c 928ff887f2a7c64275182060d94d06fdddbe32226c569781cf7e7edc6f58d7fd
+ F src/resolve.c 7e936a09405cb59e2b3e51a3ad23753e4803afc5269c5171a54c9bdd70f4fc50
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
  F src/select.c 4c05cde130f26991b7411d8c6809e0630625e18078742c963a047b4b9cc01d49
- F src/shell.c.in fc532c5deb1c94ee1f0617a90987b1dea91cccb2e56bb210aca907e9b2a809d5
- F src/sqlite.h.in 583511a8b5e6a8de6c992c567a2dbbb104b6eded0a6fd0f17541fd33a124d269
 -F src/shell.c.in 9dcc77636cdc48d67ea0cd7f4d54d791202e435e05598ec0a147cd61269e1c4d
 -F src/sqlite.h.in 749454ec71c875bc130d399ff9a7e47191d143d1b9d8b4af3839b6028df9eda9
++F src/shell.c.in b4f2605ab32ef5c3f2391ccdc3b9bf3f26bc98489bcf25efc2f793fa8e17f7a6
++F src/sqlite.h.in 12e7c5d452f41fbf8c570c983e277a7e27f5fb860b44f960f0ec5ef069820de5
  F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
  F src/sqlite3ext.h 9788c301f95370fa30e808861f1d2e6f022a816ddbe2a4f67486784c1b31db2e
- F src/sqliteInt.h 54eb771a8587faab762368641cb8b08006c9dbcbff49e2d2ef8c136511f63827
 -F src/sqliteInt.h 5bec8cfdc8346a122b35312452eb6af33fc750a6c901f2c651a2f53eba0b979f
++F src/sqliteInt.h a3c8abf0ac843fd13bd87b9952c5349643c6a83fa88317cd787c393d76245cfa
  F src/sqliteLimit.h c70656b67ab5b96741a8f1c812bdd80c81f2b1c1e443d0cc3ea8c33bb1f1a092
 -F src/status.c 7565d63a79aa2f326339a24a0461a60096d0bd2bce711fefb50b5c89335f3592
 +F src/status.c 426bbfac49c3501675d3c2db63834a29d78e14587695e81327f86689d7eb1593
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 -F src/tclsqlite.c 7401c73c917a4d1b380c896a324c8d8eb533a999559d9e339d479596553bebfd
 +F src/tclsqlite.c 2a8c7f54fc667a4d4aa71c93bf547b7ca05d33bd3f96394ec80462c25a7bb1ed
  F src/tclsqlite.h 614b3780a62522bc9f8f2b9fb22689e8009958e7aa77e572d0f3149050af348a
- F src/test1.c 3e3b013f59ffcb57dce00c90d55907072d71d4e970cb0a590cb261efe11bae9c
+ F src/test1.c fe1316579a1778eb96d0bd12807f9dddc5e3984f5950127e2e1718c050cb6304
  F src/test2.c 2b9ab96bba63a1c369d5769390475259ad210f144a877805f2e32e563f9e93c1
  F src/test3.c 432646f581d8af1bb495e58fc98234380250954f5d5535e507fc785eccc3987a
  F src/test4.c 0ac87fc13cdb334ab3a71823f99b6c32a6bebe5d603cd6a71d84c823d43a25a0
@@@ -804,14 -803,14 +807,14 @@@ F src/trigger.c 5497958d682b6269924b19c
  F src/update.c 3e5e7ff66fa19ebe4d1b113d480639a24cc1175adbefabbd1a948a07f28e37cf
  F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1
  F src/utf.c 7267c3fb9e2467020507601af3354c2446c61f444387e094c779dccd5ca62165
- F src/util.c 377af5da226519a0f374dc3c6d408c9d303a92943e3ae5986432c7d52e6679a2
+ F src/util.c 98cf12c8ba65623a76c1eb6e6afa98ff40107c9919bf79af42f4bfc70e654232
 -F src/vacuum.c d3d35d8ae893d419ade5fa196d761a83bddcbb62137a1a157ae751ef38b26e82
 -F src/vdbe.c 8ed6f274dff8b9fb961d050a9ab933e7f6509221718bec862e85729d171c1606
 -F src/vdbe.h 70e862ac8a11b590f8c1eaac17a0078429d42bc4ea3f757a9af0f451dd966a71
 +F src/vacuum.c 13b7c418199d6344e341eb6ae3759b7886f925c0f5920d30925dbe45fc933fbd
- F src/vdbe.c 05add2272ecaf424a6da9d85a97edd61d0a3757c5a437f00e7f18d6b498f8412
++F src/vdbe.c a7ac9e57659412c74ff8dd24e3cfdd7dbfec70cb5037733631d6d3137c3eb5b7
 +F src/vdbe.h e085d965c37e722b60303ec9345f42bd14a89e0c5ae9760ce648f24d6848fd86
  F src/vdbeInt.h c31ba4dc8d280c2b1dc89c6fcee68f2555e3813ab34279552c20b964c0e338b1
  F src/vdbeapi.c 6cdcbe5c7afa754c998e73d2d5d2805556268362914b952811bdfb9c78a37cf1
- F src/vdbeaux.c 407f89847f4673c4a5b8710d9e8aa505e9d25723c40f4f7c94f4c3884b4b1613
 -F src/vdbeaux.c bd3aaf77593a5590f617ce173e8677a21eca18522eadc1c4bc81b53f6d1c7e19
 -F src/vdbeblob.c b3f0640db9642fbdc88bd6ebcc83d6009514cafc98f062f675f2c8d505d82692
++F src/vdbeaux.c 821cf38a1f43425a190d8dc18ef0b7978686af37bfcac53bcf96005ea9b79c9f
 +F src/vdbeblob.c ad7e1db18b53074702ce267f48106c12fb1ac76b54b6eb3aefa4188411eb7c46
  F src/vdbemem.c efacb8f229422d2a4db0ed38e49b7f3897862a98d82b261aa3b43d7a2d98c6da
  F src/vdbesort.c b69220f4ea9ffea5fdef34d968c60305444eea909252a81933b54c296d9cca70
  F src/vdbetrace.c 49e689f751505839742f4a243a1a566e57d5c9eaf0d33bbaa26e2de3febf7b41
@@@ -821,10 -820,10 +824,10 @@@ F src/vxworks.h 9d18819c5235b49c2340a8a
  F src/wal.c 7340d4f9bb827bd349127cac6b2cf0cb7f76b9fda645f7b9b0bf7a6e0b1e2e7c
  F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
  F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014
- F src/where.c 0f5236c04ed1a7fe65b2e2c39e630e2182f56bd8a2e3ddf20e2256a4158609a2
 -F src/where.c 33e4a6558ee69f33d6a4e7069e3a40a55959d14e5653a9a83926e70305d471f3
++F src/where.c 148d34f2d6af07f30cc6ecbbe56e73027639792b2adb19d770341bc199ce5078
  F src/whereInt.h 8d94cb116c9e06205c3d5ac87af065fc044f8cf08bfdccd94b6ea1c1308e65da
- F src/wherecode.c 676cb6cb02878643e817d9917a2d3522b83a3736b2cedd3dc8a01d7bb92af6c2
- F src/whereexpr.c e9f7185fba366d9365aa7a97329609e4cf00b3dd0400d069fbaa5187350c17c6
+ F src/wherecode.c 4d573077652f79780d6b50840ab8cbb72053dbb4eb230780dd2a146ab034475d
+ F src/whereexpr.c d111a5cb6147253a54010d883474b6aecc0b3009d352c087ee5295d74697bfef
  F src/window.c c0a38cd32473e8e8e7bc435039f914a36ca42465506dc491c65870c01ddac9fb
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test 4d7a34d328e58ca2a2d78fd76c27614a41ca7ddf4312ded9c68c04f430b3b47d
@@@ -1637,16 -1627,16 +1640,16 @@@ F test/sharedA.test 64bdd21216dda2c6a3b
  F test/sharedB.test 1a84863d7a2204e0d42f2e1606577c5e92e4473fa37ea0f5bdf829e4bf8ee707
  F test/shared_err.test 32634e404a3317eeb94abc7a099c556a346fdb8fb3858dbe222a4cbb8926a939
  F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
- F test/shell-prompt.sql 43ed98433bfde83171b5d06c300525154f4cab9230570a326ca606aaef351db6
+ F test/shell-prompt.sql 8a320a78812d75349bd5e1a95178f7ff1f2194bb4cceee572865d127c51684b3
 -F test/shell1.test c84eff209f93ad17ccdf7e1634969fc8231684254edeb21d9b13d67c3179cdb5
 +F test/shell1.test b46953a435db5d22ccd4ccdb63740478a4b1e348977b81aad2ae514fa29df0e4
  F test/shell2.test dc541d2681503e55466a24d35a4cbf8ca5b90b8fcdef37fc4db07373a67d31d3
 -F test/shell3.test 91efdd545097a61a1f72cf79c9ad5b49da080f3f10282eaf4c3c272cd1012db2
 +F test/shell3.test 05ee11f53272c76557406f9ac8b36eadea17fff967772db98bcb4067e342c849
  F test/shell4.test e25580a792b7b54560c3a76b6968bd8189261f38979fe28e6bc6312c5db280db
- F test/shell5.test a9cd2c8b62e125049ef500937674f47dd6787f0157ac0515aa554044a4dc3ea9
- F test/shell6.test e3b883b61d4916b6906678a35f9d19054861123ad91b856461e0a456273bdbb8
+ F test/shell5.test a0c43d82a811a463a5d07d6418c5a045ab01a072544db8aa31ae394e93845d8d
+ F test/shell6.test 596f2eb385a1097d4e9130b4d4f663a24cba294b35f13b774b8f13553dec307d
  F test/shell7.test 43fd8e511c533bab5232e95c7b4be93b243451709e89582600d4b6e67693d5c3
  F test/shell8.test 38c9e4d7e85d2a3ecfacaa9f6cda4f7a81bf4fffb5f3f37f9cd76827c6883192
 -F test/shell9.test c0e8871061a92151450b3332279a893b516fa73a6c46d4f51a0998407cbf8c89
 +F test/shell9.test ae86ac0ad4ed2c8be0950b7fb0f217bf43217e2d424fe5998191cfcaa93ef812
  F test/shellA.test 05cdaafa1f79913654487ce3aefa038d4106245d58f52e02faf506140a76d480
  F test/shellB.test 82622da7783c32ce931138bec3d5016e802d70361b9f9364b5d49c1dfc2f5af9
  F test/shmlock.test 9f1f729a7fe2c46c88b156af819ac9b72c0714ac6f7246638a73c5752b5fd13c
@@@ -1731,10 -1721,10 +1734,10 @@@ F test/temptable2.test 76821347810ecc88
  F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
  F test/temptrigfault.tes fc5918e64f3867156fefe7cfca9d8e1f495134a5229b2b511b0dc11c07f2eab4
  F test/temptrigger.test a00f258ed8d21a0e8fd4f322f15e8cfb5cef2e43655670e07a753e3fb4769d61
 -F test/tester.tcl 2d943f60200e0a36bcd3f1f0baf181a751cd3604ef6b6bd4c8dc39b4e8a53116
 +F test/tester.tcl cb0cd9807cc34a3ea2849f049515ce2301fb838357ae671a12c8cc53a6ab2f91
  F test/testloadext.c 862b848783eaed9985fbce46c65cd214664376b549fae252b364d5d1ef350a27
- F test/testrunner.tcl e154881c634995424065d7ed5adc5e2092fa54902ff1f2dec8773333a5cbca36 x
- F test/testrunner_data.tcl dec9cee60fe74bf7e462261a99bef8b35ac9e1064c15dfcc2a3e65fb0ccabc6e
 -F test/testrunner.tcl 8f9cd46fe10f670f7f1f3430323f6031a13690303bd7810042d4bb20c47c5d9b x
 -F test/testrunner_data.tcl 4b3cf036d39c98b83f9289a5c047eb01089c932d4f59a81bf764f6800589b959
++F test/testrunner.tcl 425c86336bfc657b501946d0690decc1a4cc38bb1713d9ea5d775ba58268393a x
++F test/testrunner_data.tcl 03269d1bf3706560241234534e79b37a82120ec33a32a0400e2ca0299486b514
  F test/testrunner_estwork.tcl 81e2ae10238f50540f42fbf2d94913052a99bfb494b69e546506323f195dcff9
  F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
  F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@@ -2217,8 -2207,8 +2221,8 @@@ F tool/warnings-clang.sh bbf6a1e685e534
  F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
  F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
- P 0237eddad10f8c2370642cd09b178bd29c31a7608ce1e9abe35a7aed689b4ef0 f0fc4e5ec334da3a1db8b0334e23d1911874c96675690da94210b2afb45f7307
- R 8be127bbca616f04611b710804ec0371
 -P 32c762bbb187e3bc964dcaad0949ebeb4da21331be842a5868feeac6088790ca
 -R e2e491adc9615183ba561a57a2edcb75
++P 578bfc438ad81692d720019060a59302ce448926f3720d31375dce050a4a7af3 64b707f4b3177384b611df5f5e4ca7da44d86313f74ff943a00581a6dd924b08
++R daadcff7508e54bf1dd28760c4bda61a
  U drh
- Z 0fbb05e570bec964aa1dbae4a7dc7147
 -Z 678d3979d92466dcd0eca2b9b77be3d3
++Z fc054aba4f6ed6452643095267f4cdaf
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 282425e5047419fc56d58fbdda8511e902c21cda,52b4f41e2706b72fbba7d9cf36c9b4b73c7b7c4b..aaf6b588f82256e08a3120e65b20ff815a44e4dc
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 578bfc438ad81692d720019060a59302ce448926f3720d31375dce050a4a7af3
 -64b707f4b3177384b611df5f5e4ca7da44d86313f74ff943a00581a6dd924b08
++b974acea28f77ffa7e80f641733966d004641fa8e7971ace9b332d706acd8dd4

diff --cc src/alter.c
Simple merge

diff --cc src/attach.c
Simple merge

diff --cc src/build.c
Simple merge

diff --cc src/os_win.c
index dfb23d99a92982be62044112152cb84f343c5131,5faff4d7a110ecb7872d186f6b3cf17782433c4d..4876fd20b58ceda99b761dc4b81a280345b55815
--- 1/src/os_win.c
--- 2/src/os_win.c
+++ b/src/os_win.c
@@@ -5308,8 -4296,8 +4296,8 @@@ static int winOpen
    char *zTmpname = 0; /* For temporary filename, if necessary. */
  
    int rc = SQLITE_OK;            /* Function Return Code */
- #if !defined(NDEBUG) || SQLITE_OS_WINCE
+ #if !defined(NDEBUG)
 -  int eType = flags&0x0FFF00;  /* Type of file to open */
 +  int eType = flags&0x0FFF00;    /* Type of file to open */
  #endif
  
    int isExclusive  = (flags & SQLITE_OPEN_EXCLUSIVE);

diff --cc src/prepare.c
index afac804371f91b7713362559dff90b5fc51fdf10,4d1295821dffef91ec1a5b927dd8e7aca2a1dbcf..eec6f3f205a1da503827e477ea4515e518cfa6e2
--- 1/src/prepare.c
--- 2/src/prepare.c
+++ b/src/prepare.c
@@@ -266,25 -216,13 +266,31 @@@ int sqlite3InitOne(sqlite3 *db, int iDb
    assert( sqlite3_mutex_held(db->mutex) );
    assert( iDb==1 || sqlite3BtreeHoldsMutex(db->aDb[iDb].pBt) );
  
-   db->init.busy = 1;
 +  pDb = &db->aDb[iDb];
 +#ifdef SQLITE_ENABLE_SHARED_SCHEMA
 +  assert( pDb->pSPool==0 || IsSharedSchema(db) );
 +  if( pDb->pSPool ){
 +    /* See if there is a free schema object in the schema-pool. If not,
 +    ** disconnect from said schema pool and continue. This function will
 +    ** connect to a (possibly different) schema-pool before returning. */
 +    Schema *pNew = sqlite3SchemaExtract(pDb->pSPool);
 +    if( pNew ){
 +      pDb->pSchema = pNew;
 +      return SQLITE_OK;
 +    }
 +    rc = sqlite3SchemaDisconnect(db, iDb, 1);
 +    if( rc!=SQLITE_OK ) goto error_out;
 +    assert( pDb->pSchema && pDb->pSPool==0 );
 +  }
 +#endif
 +
+   db->init.busy = 1 + ((mFlags & INITFLAG_AlterAdd)!=0);
+   /* ^--- Any non-zero value for init.busy means that we are scanning
+   ** the sqlite_schema table to build the internal schema representation,
+   ** rather than running actual CREATE statements.  init.busy==2 has the
+   ** additional meaning that the scan is happening as part of
+   ** ALTER TABLE ADD COLUMN, which is stricter in its enforcement of
+   ** function name resolution. */
  
    /* Construct the in-memory representation schema tables (sqlite_schema or
    ** sqlite_temp_schema) by invoking the parser directly.  The appropriate

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

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
index 7070e43d6a271554be8b29f652cdd87f93af6eef,2e87deec1b9971209b5da877638dc99cb5a5ca54..87af19cf4df06c7862b3c2f6c3280bd81f7b7d67
--- 1/src/vdbeaux.c
--- 2/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@@ -556,13 -556,21 +556,23 @@@ void sqlite3VdbeExplainPop(Parse *pPars
  ** sqlite3VdbeAddOp4() since it needs to also needs to mark all btrees
  ** as having been used.
  **
- ** The zWhere string must have been obtained from sqlite3_malloc().
+ ** zWhere is a WHERE clause that defines which entries of the schema
+ ** to reparse.  If zWhere==0, that means all entries.  p5 is a mask
+ ** of INITFLAG_* values for the parse.
+ **
+ ** In the current usage, the following are always true:
+ **
+ **     ALTER TABLE:     zWhere==0,  p5!=0
+ **     Otherwise:       zWhere!=0,  p5==0
+ **
+ ** The zWhere string must have been obtained from sqlite3DbMalloc().
  ** This routine will take ownership of the allocated memory.
  */
 -void sqlite3VdbeAddParseSchemaOp(Vdbe *p, int iDb, char *zWhere, u16 p5){
 +void sqlite3VdbeAddParseSchemaOp(Parse *pParse, int iDb, char *zWhere, u16 p5){
 +  Vdbe *p = pParse->pVdbe;
    int j;
+   assert( p5==0 || zWhere==0 );
 +  sqlite3SchemaWritable(pParse, iDb);
    sqlite3VdbeAddOp4(p, OP_ParseSchema, iDb, 0, 0, zWhere, P4_DYNAMIC);
    sqlite3VdbeChangeP5(p, p5);
    for(j=0; j<p->db->nDb; j++) sqlite3VdbeUsesBtree(p, j);

diff --cc src/where.c
Simple merge

diff --cc test/testrunner.tcl
Simple merge

diff --cc test/testrunner_data.tcl
index cfcbea3753cb0f8321c5e7e828a1854c4ce59aab,822ab6193e66c31ecb77cfa28a2c5d25cbea026e..d649adce56ecfb77a021a4b7b97827ef349c6b46
--- 1/test/testrunner_data.tcl
--- 2/test/testrunner_data.tcl
+++ b/test/testrunner_data.tcl
@@@ -494,31 -484,35 +496,35 @@@ proc make_sh_script {srcdir opts cflag
    set myopts ""
    if {[info exists ::env(OPTS)]} {
      append myopts "# From environment variable:\n"
 -    append myopts "OPTS=\"$::env(OPTS)\"\n\n"
 +    append myopts "OPTIONS=\"$::env(OPTS)\"\n\n"
    }
    foreach o [lsort $opts] { 
 -    append myopts "OPTS=\"\$OPTS $o\"\n"
 +    append myopts "OPTIONS=\"\$OPTS $o\"\n"
    }
  
-   return [trimscript [subst -nocommands {
-     set -e
-     if [ "\$#" -ne 1 ] ; then
-       echo "Usage: \$0 <target>"
-       exit -1
-     fi
-     
-     SRCDIR="$srcdir"
-     TCLDIR="$tcldir"
-     
-     if [ ! -f Makefile ] ; then
-       \$SRCDIR/configure --with-tcl=\$TCLDIR $configOpts 
-     fi
-     
-     $myopts
-     CFLAGS="$cflags"
-     
-     make \$1 "CFLAGS=\$CFLAGS" "OPTS=\$OPTS" $makeOpts
+   set out "set -e\n"
+   if {[llength $targets]==0} {
+     set out [trimscript {
+       if [ "$#" -lt 1 ] ; then
+         echo "Usage: $0 <target>"
+         exit -1
+       fi
+     }]\n
+   }
+   append out [trimscript [subst -nocommands {
+       SRCDIR="$srcdir"
+       TCLDIR="$tcldir"
+       if [ ! -f Makefile ] ; then
+         \$SRCDIR/configure --with-tcl=\$TCLDIR $configOpts 
+       fi
+       $myopts
+       CFLAGS="$cflags"
+   }]]\n
+   if {[llength $targets]==0} {set targets {$*}}
+   append out [trimscript [subst -nocommands {
+       make $targets "CFLAGS=\$CFLAGS" "OPTS=\$OPTS" $makeOpts
    }]]
+   return $out
  }
  
  # Generate the text of a *.bat script.