From: drh <>
Date: Wed, 13 Mar 2024 15:59:02 +0000 (+0000)
Subject: Merge the latest trunk enhancements into the reuse-schema branch.  Fix
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cac74b855d4f1e1effb803d8f562a178ec2edd6d;p=thirdparty%2Fsqlite.git

Merge the latest trunk enhancements into the reuse-schema branch.  Fix
the reuse-schema build of the CLI so that it works again.

FossilOrigin-Name: 70ef3784f678e29a7b067e557f69ca0a14e7823c344bb438dc4373a454389218
---

cac74b855d4f1e1effb803d8f562a178ec2edd6d
diff --cc manifest
index bd2d090e24,f47cb0a280..8aeccdf21f
--- a/manifest
+++ b/manifest
@@@ -1,14 -1,16 +1,16 @@@
- C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
- D 2024-01-13T20:38:49.101
 -C If\sthe\sNJOB\senvironment\svariable\sis\sa\spositive\sinteger,\sit\scauses\ntestrunner.tcl\sto\srun\sthat\smany\sjobs.
 -D 2024-03-13T13:43:21.042
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sreuse-schema\sbranch.\s\sFix\nthe\sreuse-schema\sbuild\sof\sthe\sCLI\sso\sthat\sit\sworks\sagain.
++D 2024-03-13T15:59:02.972
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in c579d5b6a16e668d7ef3a77c3adf96d642d58d7fc6d04bc07c2ab561aec84ded
 -F Makefile.in 5f2389d2a3c44b56621bb5156a9cb6e2bef01f7ec14a19335b1559cf0474bdde
++F Makefile.in a0eb3db43e29856dcfdd7e6c468b8818f26d6146fbabdd196a3c03c1c5de99b1
  F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
- F Makefile.msc b834976e33a0a68519b276c42f30f31a07dac27187099f865f52b306694733e4
 -F Makefile.msc e64a52619310d3067f6c38f56eedd15918a82dade70954197d6da486ad99d7f4
++F Makefile.msc a6f772c667c3a967c1a65b8f7bf1502b73001052567b5c7702cde8dc80f2568b
  F README.md 6358805260a03ebead84e168bbf3740ddf3f683b477e478567186aa7afb490d3
- F VERSION 73573d4545343f001bf5dc5461173a7c78c203dd046cabcf99153878cf25d3a6
+ F VERSION c84541c6a9e8426462176fbb1f9ecb5cfd7d1bb56228053ff7eeba8841673eb6
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
+ F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
+ F art/icon-80x90.gif 65509ce3e5f86a9cd64fe7fca2d23954199f31fe44c1e09e208c80fb83d87031
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
  F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
@@@ -40,10 -42,9 +42,10 @@@ F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019
  F doc/compile-for-windows.md 50b27d77be96195c66031a3181cb8684ed822327ea834e07f9c014213e5e3bcf
  F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347bb123ce1ea4f
  F doc/jsonb.md 5fab4b8613aa9153fbeb6259297bd4697988af8b3d23900deba588fa7841456b
- F doc/lemon.html 44a53a1d2b42d7751f7b2f478efb23c978e258d794bfd172442307a755b9fa44
+ F doc/lemon.html 8b266ff711d2ec7f867c3dca37634963f48a630329908cc282beebfa8c708706
  F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
 +F doc/shared_schema.md 759fc374709fccf4e5d2d0cbd05f8fedd38fb022bdd8a6c5b5f492684c7023b9
- F doc/testrunner.md 8d36ec692cf4994bb66d84a4645b9afa1ce9d47dc12cbf8d437c5a5fb6ddeedb
+ F doc/testrunner.md 15583cf8c7d8a1c3378fd5d4319ca769a14c4d950a5df9b015d01d5be290dc69
  F doc/trusted-schema.md 33625008620e879c7bcfbbfa079587612c434fa094d338b08242288d358c3e8a
  F doc/vdbesort-memory.md 4da2639c14cd24a31e0af694b1a8dd37eaf277aff3867e9a8cc14046bc49df56
  F doc/vfs-shm.txt e101f27ea02a8387ce46a05be2b1a902a021d37a
@@@ -573,10 -584,10 +585,10 @@@ F ext/session/sqlite3session.c 829d468f
  F ext/session/sqlite3session.h 4cf19a51975746d7cff2fdd74db8b769c570958e1c3639ac150d824ac1553b3e
  F ext/session/test_session.c 7b94ad945cd4afe6c73ee935aeb3d44b4446186e1729362af616c7695a5283d9
  F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
- F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
+ F ext/userauth/user-auth.txt ca7e9ee82ca4e1c1744295f8184dd70edfae1992865d26c64303f539eb6c084c
  F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 -F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 +F ext/wasm/EXPORTED_FUNCTIONS.fiddle 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
- F ext/wasm/GNUmakefile 99aad6d6a28c43573f80825e986427c1a024a3298aaf0c69c56a0c6b336f12c8
+ F ext/wasm/GNUmakefile 4bb4cf70a8153dd5b5fee17d724075c54174da630b424bbcf48c744633396f62
  F ext/wasm/README-dist.txt 6382cb9548076fca472fb3330bbdba3a55c1ea0b180ff9253f084f07ff383576
  F ext/wasm/README.md a8a2962c3aebdf8d2104a9102e336c5554e78fc6072746e5daf9c61514e7d193
  F ext/wasm/SQLTester/GNUmakefile e0794f676d55819951bbfae45cc5e8d7818dc460492dc317ce7f0d2eca15caff
@@@ -584,27 -595,28 +596,28 @@@ F ext/wasm/SQLTester/SQLTester.mjs ce76
  F ext/wasm/SQLTester/SQLTester.run.mjs c72b7fe2072d05992f7a3d8c6a1d34e95712513ceabe40849784e24e41c84638
  F ext/wasm/SQLTester/index.html 3f8a016df0776be76605abf20e815ecaafbe055abac0e1fe5ea080e7846b760d
  F ext/wasm/SQLTester/touint8array.c 2d5ece04ec1393a6a60c4bf96385bda5e1a10ad49f3038b96460fc5e5aa7e536
 -F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api f442460ed9a109e637dd3ea1caa4489553ad9414e8988118b208bb7a4bbece6b
 +F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api c5eaceabb9e759aaae7d3101a4a3e542f96ab2c99d89a80ce20ec18c23115f33
  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 5eb44fa02e9c693a1884a3692428647894b0380b24bca120866b7a24c8786134
+ F ext/wasm/api/README.md 34fe11466f9c1d81b10a0469e1114e5f1c5a6365c73d80a1a6ca639a1a358b73
  F ext/wasm/api/extern-post-js.c-pp.js c4154a7f90c2d7e51fd6738273908152036c3457fdc0b6523f1be3ef51105aac
  F ext/wasm/api/extern-pre-js.js cc61c09c7a24a07dbecb4c352453c3985170cec12b4e7e7e7a4d11d43c5c8f41
  F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08902f15c34720ee4a1
- F ext/wasm/api/post-js-header.js 47b6b281f39ad59fa6e8b658308cd98ea292c286a68407b35ff3ed9cfd281a62
+ F ext/wasm/api/post-js-header.js 04dc12c3edd666b64a1b4ef3b6690c88dcc653f26451fd4734472d8e29c1c122
  F ext/wasm/api/pre-js.c-pp.js ad906703f7429590f2fbf5e6498513bf727a1a4f0ebfa057afb08161d7511219
  F ext/wasm/api/sqlite3-api-cleanup.js d235ad237df6954145404305040991c72ef8b1881715d2a650dda7b3c2576d0e
- F ext/wasm/api/sqlite3-api-glue.js 119b91c8a7ce6648679eb66fcdd1ed07ef7fd892eb501d658fbfefcc962012d9
+ F ext/wasm/api/sqlite3-api-glue.js 587dc6db2d69329a5f4cb9635c377f516cf4a8e30f443f33380e5044889ec71b
  F ext/wasm/api/sqlite3-api-oo1.js 7f3bcf0549ac44cde4b9da0b642d771916738d3f6781fb8a1757c50a91e506c0
- F ext/wasm/api/sqlite3-api-prologue.js 9aeba7b45cf41b3a26d34d7fb2525633cd1adfc544888c1ea8dbb077496f4ce9
- F ext/wasm/api/sqlite3-api-worker1.js fd46628ef147dd5856c88f63a9a279a40f744f1fdfddd55251ad8fbc3d8200ae
+ F ext/wasm/api/sqlite3-api-prologue.js 93a72b07b2a5d964d2edc76a90b439ece49298bd7ba60a1c6ae5d4878213701e
+ F ext/wasm/api/sqlite3-api-worker1.js 8d9c0562831f62218170a3373468d8a0b7a6503b5985e309b69bf71187b525cf
  F ext/wasm/api/sqlite3-license-version-header.js 0c807a421f0187e778dc1078f10d2994b915123c1223fe752b60afdcd1263f89
- F ext/wasm/api/sqlite3-opfs-async-proxy.js 8cf8a897726f14071fae6be6648125162b256dfb4f96555b865dbb7a6b65e379
- F ext/wasm/api/sqlite3-v-helper.js 7daa0eab0a513a25b05e9abae7b5beaaa39209b3ed12f86aeae9ef8d2719ed25
- F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js 595953994aa3ae2287c889c4da39ab3d6f17b6461ecf4bec334b7a3faafddb02
- F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 46c4afa6c50d7369252c104f274ad977a97e91ccfafc38b400fe36e90bdda88e
- F ext/wasm/api/sqlite3-wasm.c dfd1f1a225b267e8fd641dcd6c7d579fbe2b731aeaa123324135efac830a2bcf
+ F ext/wasm/api/sqlite3-opfs-async-proxy.js b4c7ce9d7f7957f243d0fbd5b6e28bac80cd3c1b738374cd0c96d89df8f2f316
 -F ext/wasm/api/sqlite3-vfs-helper.c-pp.js 3f828cc66758acb40e9c5b4dcfd87fd478a14c8fb7f0630264e6c7fa0e57515d
++F ext/wasm/api/sqlite3-vfs-helper.c-pp.js 3f828cc66758acb40e9c5b4dcfd87fd478a14c8fb7f0630264e6c7fa0e57515d w ext/wasm/api/sqlite3-v-helper.js
+ F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js 5a430874906ff3f4a6ca69aadf0c2aaedc1bb45489b8365bff7e955a83a8d42a
+ F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 3c72f1a0e6a7343c8c882d29d01bb440f10be12c844651605b486e76f3d6cc8c
+ F ext/wasm/api/sqlite3-vtab-helper.c-pp.js a2fcbc3fecdd0eea229283584ebc122f29d98194083675dbe5cb2cf3a17fe309
+ F ext/wasm/api/sqlite3-wasm.c d33a16495ca871781e78812d3a18fed78b797468fffee657b8d7199b277ff359
 -F ext/wasm/api/sqlite3-worker1-promiser.c-pp.js bd89edfe42a4d7122a6d6d405c5423cf00aabba1f76f6ea8e2dba9c628ddd91a
 +F ext/wasm/api/sqlite3-worker1-promiser.c-pp.js c5ac33e39f21a3481812d7333ca6e18853640d423a01960ca8dbc6e7c5c3c21c
  F ext/wasm/api/sqlite3-worker1.c-pp.js 5e8706c2c4af2a57fbcdc02f4e7ef79869971bc21bb8ede777687786ce1c92d5
  F ext/wasm/batch-runner-sahpool.html e9a38fdeb36a13eac7b50241dfe7ae066fe3f51f5c0b0151e7baee5fce0d07a7
  F ext/wasm/batch-runner-sahpool.js 54a3ac228e6c4703fe72fb65c897e19156263a51fe9b7e21d2834a45e876aabd
@@@ -620,19 -632,19 +633,19 @@@ F ext/wasm/demo-123.html 8c70a412ce386b
  F ext/wasm/demo-123.js c7b3cca50c55841c381a9ca4f9396e5bbdc6114273d0b10a43e378e32e7be5bf
  F ext/wasm/demo-jsstorage.html 409c4be4af5f207fb2877160724b91b33ea36a3cd8c204e8da1acb828ffe588e
  F ext/wasm/demo-jsstorage.js 44e3ae7ec2483b6c511384c3c290beb6f305c721186bcf5398ca4e00004a06b8
- F ext/wasm/demo-worker1-promiser.html 1de7c248c7c2cfd4a5783d2aa154bce62d74c6de98ab22f5786620b3354ed15f
- F ext/wasm/demo-worker1-promiser.js 5e5c7d7c91cd7aae9cc733afd02569ba9c6928292db413b550e8b842f4b75e87
 -F ext/wasm/demo-worker1-promiser.c-pp.html 635cf90685805e21772a5f7a35d1ace80f98a9ef7c42ff04d7a125ddca7e5db8
 -F ext/wasm/demo-worker1-promiser.c-pp.js fcc628cb42fcfaf07d250477801de1e6deb1e319d003976612a0db8d76b9fccc
++F ext/wasm/demo-worker1-promiser.c-pp.html 635cf90685805e21772a5f7a35d1ace80f98a9ef7c42ff04d7a125ddca7e5db8 w ext/wasm/demo-worker1-promiser.html
++F ext/wasm/demo-worker1-promiser.c-pp.js fcc628cb42fcfaf07d250477801de1e6deb1e319d003976612a0db8d76b9fccc w ext/wasm/demo-worker1-promiser.js
  F ext/wasm/demo-worker1.html 2c178c1890a2beb5a5fecb1453e796d067a4b8d3d2a04d65ca2eb1ab2c68ef5d
  F ext/wasm/demo-worker1.js 836bece8615b17b1b572584f7b15912236a5947fe8c68b98d2737d7e287447ef
- F ext/wasm/dist.make 3a851858aad72e246a5d9c5aaf6b6a144305f1bf898ac1846760ea7bab95c9a3
+ F ext/wasm/dist.make f2ce42305268fe33d4b50f6e4bb3daf4a60302a90736eee382f1b8af9ff32ec1
  F ext/wasm/example_extra_init.c 2347cd69d19d839ef4e5e77b7855103a7fe3ef2af86f2e8c95839afd8b05862f
- F ext/wasm/fiddle.make fa2ba6e90457ba2a71cb745f200d409caf773076df75ae5b177cc225d7627a11
+ F ext/wasm/fiddle.make 3c2eace29255d6ddd219f5d8cc2728cb28b9fe717ea80b6062c2a6178947a16b
  F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
- F ext/wasm/fiddle/fiddle-worker.js e0153f9af6500805c6f09c0b3cfdb7d857e9d6863dbee9d50d1628fccf5f4b4d
+ F ext/wasm/fiddle/fiddle-worker.js 850e66fce39b89d59e161d1abac43a181a4caa89ddeea162765d660277cd84ce
 +F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
- F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
- F ext/wasm/index-dist.html e91d76e4581185238fd3d42ed86ec600f7023ed3e3a944c5c356f25304bf1263
- F ext/wasm/index.html b31ce41c0da476d5ffcef23069b9d3415b419d65af5779096ebcfbcbade453a9
+ F ext/wasm/fiddle/fiddle.js b444a5646a9aac9f3fc06c53d78af5e1912eb235d69a8e6010723e4eb0e9d4a1
 -F ext/wasm/fiddle/index.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
+ F ext/wasm/index-dist.html 564b5ec5669676482c5a25dea9e721d8eafed426ecb155f93d29aeff8507511f
+ F ext/wasm/index.html 4337f495416756802669f69f9f9f3df9f87ee4c1918e6718719b4b5718e4713a
  F ext/wasm/jaccwabyt/jaccwabyt.js 1264710db3cfbcb6887d95665b7aeba60c1126eaef789ca4cf1a4a17d5bc7f54
  F ext/wasm/jaccwabyt/jaccwabyt.md 59a20df389abcc3606eb4eaea7fb7ba14504beb3e345dbea9b99a0618ba3bec8
  F ext/wasm/module-symbols.html dc476b403369b26a1a23773e13b80f41b9a49f0825e81435fe3600a7cfbbe337
@@@ -658,7 -670,7 +671,7 @@@ F ext/wasm/wasmfs.make 8a4955882aaa0783
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
- F main.mk e435c4b0cab0fb81555e49646b19b40ad5a1e41e48d376cd8d49a267a29fec94
 -F main.mk e5da4b6c13f2b15bba7f1efb0a47089dfdde0973e85a024785485655d59fd758
++F main.mk f2dcfa5f38dc87e07d433ed29bbb046c847c4c01c471c38c3593746289e3652e
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
  F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@@ -670,21 -682,21 +683,21 @@@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47
  F sqlite3.1 acdff36db796e2d00225b911d3047d580cd136547298435426ce9d40347973cc
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
  F sqlite_cfg.h.in baf2e409c63d4e7a765e17769b6ff17c5a82bbd9cbf1e284fd2e4cefaff3fcf2
 -F src/alter.c 30c2333b8bb3af71e4eb9adeadee8aa20edb15917ed44b8422e5cd15f3dfcddc
 -F src/analyze.c a3df28274e2565ba5656577d7e3fd262169a213e6eb0bd47890e0f0729a4031c
 -F src/attach.c cc9d00d30da916ff656038211410ccf04ed784b7564639b9b61d1839ed69fd39
 +F src/alter.c 47253323822cc2ad54d5fe5695db683fae2f904242e9df55a1bc5406b1293e3a
- F src/analyze.c 8edea1284ca0ac32fff09736a01d0f6832f121b78723b1439c69c1a53e163587
++F src/analyze.c d4147664724ed16e86e974e1714f893105a8d124bad3acebd30a3c0051553f50
 +F src/attach.c 2af98700f1a3867a78475aa164571a2fbacce09c681076b01b119ef31b8ef4ac
  F src/auth.c 19b7ccacae3dfba23fc6f1d0af68134fa216e9040e53b0681b4715445ea030b4
  F src/backup.c 5c97e8023aab1ce14a42387eb3ae00ba5a0644569e3476f38661fa6f824c3523
  F src/bitvec.c 9eac5f42c11914d5ef00a75605bb205e934f435c579687f985f1f8b0995c8645
  F src/btmutex.c 79a43670447eacc651519a429f6ece9fd638563cf95b469d6891185ddae2b522
- F src/btree.c dee25e097b749275333b55d64a5ffc079249576f8e88a2ee476468cf67510f4b
- F src/btree.h 03e3356f5208bcab8eed4e094240fdac4a7f9f5ddf5e91045ce589f67d47c240
- F src/btreeInt.h 3e2589726c4f105e653461814f65857465da68be1fac688de340c43b873f4062
- F src/build.c 9a8a4b14de796bbd9b93562f85158e74f8fcb7f9894cc1b6de9b8d2437d7eb16
+ F src/btree.c 285b493d843e7ba8ef78b6ae7d31238e904901dbc0c484f7904de4cf18fd8802
+ F src/btree.h 55066f513eb095db935169dab1dc2f7c7a747ef223c533f5d4ad4dfed346cbd0
+ F src/btreeInt.h 98aadb6dcb77b012cab2574d6a728fad56b337fc946839b9898c4b4c969e30b6
 -F src/build.c 04f1bcee189f045ab086d84fee95db42cb49df82ff8e84af8136309ff3c8a75f
 -F src/callback.c db3a45e376deff6a16c0058163fe0ae2b73a2945f3f408ca32cf74960b28d490
++F src/build.c 289d51f984aebc228dcf2d46bc538099f1b0a044ae3218cdb6ba5a14cf86dc57
 +F src/callback.c fbd4e8247f1a7f37aec721bde0e312e79cc3bfa41f55a59930bc876ca6baf455
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 23331529e654be40ca97d171cbbffe9b3d4c71cc53b78fe5501230675952da8b
- F src/date.c 3b8d02977d160e128469de38493b4085f7c5cf4073193459909a6af3cf6d7c91
+ F src/date.c 126ba2ab10aeb2e7ba6e089b5f07b747c0625b8287f78b60da346eda8d23c875
  F src/dbpage.c 80e46e1df623ec40486da7a5086cb723b0275a6e2a7b01d9f9b5da0f04ba2782
  F src/dbstat.c 3b677254d512fcafd4d0b341bf267b38b235ccfddbef24f9154e19360fa22e43
  F src/delete.c cb766727c78e715f9fb7ec8a7d03658ed2a3016343ca687acfcec9083cdca500
@@@ -697,12 -709,12 +710,12 @@@ F src/hash.c 9ee4269fb1d6632a6fecfb9479
  F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
  F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 3f0a94082d978bbdd33c38fefea15346c6c6bffb70bc645a71dc0f1f87dd3276
- F src/json.c 4913fd22c4f0fa30643afb93a4d78d289cd490620e782b31016c3d4b2049b1cc
+ F src/insert.c eb33ea46dcab93e90f112fced343aaf41f59cbd2e951d5066f1f9302be1c2f34
+ F src/json.c e2e40760d6689134c3e2ece38c6a496b34ff5e2661a8f238444a119af666fdce
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 -F src/main.c 438b95162acfa17b7d218f586f5bde11d6ae82bcf030c9611fc537556870ad6b
 +F src/main.c 93593ecad08c1b73a3f5d5d9ae6e81c297853fdc198fb947cd7c66bfe7e40786
- F src/malloc.c f016922435dc7d1f1f5083a03338a3e91f8c67ce2c5bdcfa4cdef62e612f5fcc
+ F src/malloc.c 410e570b30c26cc36e3372577df50f7a96ee3eed5b2b161c6b6b48773c650c5e
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2
  F src/mem2.c c8bfc9446fd0798bddd495eb5d9dbafa7d4b7287d8c22d50a83ac9daa26d8a75
@@@ -731,24 -743,24 +744,24 @@@ F src/parse.y 6209f01e8e749537957145474
  F src/pcache.c 040b165f30622a21b7a9a77c6f2e4877a32fb7f22d4c7f0d2a6fa6833a156a75
  F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
  F src/pcache1.c 602acb23c471bb8d557a6f0083cc2be641d6cafcafa19e481eba7ef4c9ca0f00
- F src/pragma.c 1ed003095b88254a72862ff3a6f67faa49ae5c3d7f9021ee99730a01ae8814de
 -F src/pragma.c e8221d6310c9923c80f6fa6d09b7ea7c5263a671f53db8d0894df23efcdb617b
 -F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 -F src/prepare.c 371f6115cb69286ebc12c6f2d7511279c2e47d9f54f475d46a554d687a3b312c
++F src/pragma.c e921676f6c29502c681b53d0c5d609a8780eaeeddbaa76459aa7607efc6a2760
 +F src/pragma.h 50f6d3b408ed56bde4f4e4aead8c0b2022030b692e8de237c1b7a0b5ce87a0c8
 +F src/prepare.c 9fe59f2cf0b75554982ffe906c83ebe478354b6d981ed0c143cc9f2f58c9210a
- F src/printf.c 18fbdf028345c8fbe6044f5f5bfda5a10d48d6287afef088cc21b0ca57985640
+ F src/printf.c 10e8bad30042f8bd6114a013b4afc229ec8ad255ab27518d7d9f52e8cbc5cd0a
  F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
- F src/resolve.c e25f51a473a5f30a0d978e4df2aaa98aeec84eac29ecae1ad4708a6c3e669345
+ F src/resolve.c ef87e3bc7700bfe761a7bbee2ce6084f1766dc816dd82a3ae77c133eec898432
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
- F src/select.c f1a81ff4f8e9e76c224e2ab3a4baa799add0db22158c7fcede65d8cc4a6fa2da
- F src/shell.c.in 3a4de15bc9a927766c487ede5401efda6fca657720be81a1c80fd1b541cdfbf2
- F src/sqlite.h.in dca7d1ba76d6621f44e222678f3f2fb57138dcdfc6c3cbb0211e94c3d04fd04b
+ F src/select.c 43fabfc01bf87addd15e39f112f1e2ade15b19594835ab8a9e5bd50839d4e1b1
 -F src/shell.c.in cf80c636bccb0ff9db46995e39d69ca21fde2a8a331d1691e4d62a69d7841c8a
 -F src/sqlite.h.in 19a2db3995a699bd7f6dfb423856242bfceb7ec849a93c91d241d19fc28d9f0f
++F src/shell.c.in 736d540ed0704e567767c712e1c1c6a3e2f87bb8b7bc9020febb121ee2f70abe
++F src/sqlite.h.in 1e317e1d0a17becd7ad9d1d30f2a248d78440d3ca2befead0e747043ebb1989a
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
- F src/sqliteInt.h 642c7e41f5d5e1c971dc113468cd290bc5f2b6348885f531f566919f23d8acc3
 -F src/sqliteInt.h 6123ce6ca6a1ef351c3b87189e92c92042728f16c088de56b9b5bc2552d0ae33
++F src/sqliteInt.h 1e23a22284150bd911b2cb5a041a7f315f5c92167db7822188f970b69f7fa224
  F src/sqliteLimit.h 6878ab64bdeb8c24a1d762d45635e34b96da21132179023338c93f820eee6728
 -F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b
 +F src/status.c 5028a0afee355aa492f26f0b6a3ec23145caa9261a93164d96cd0b9bf1b2318f
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 -F src/tclsqlite.c ecbc3c99c0d0c3ed122a913f143026c26d38d57f33e06bb71185dd5c1efe37cd
 +F src/tclsqlite.c df375d63a3b0f06e79f29b6876c228c8896599497d6f54adbcd12d7d71b3162d
- F src/test1.c ac6542cddd1f405e332d869946b977b2ce8b4dc28b9f7cc61df38abe1fe49bc3
+ F src/test1.c 310f43eb17a9252a7790726ca652e4ea3197da17c19eec93b8578863a49dc7b4
  F src/test2.c 54520d0565ef2b9bf0f8f1dcac43dc4d06baf4ffe13d10905f8d8c3ad3e4b9ab
  F src/test3.c e5178558c41ff53236ae0271e9acb3d6885a94981d2eb939536ee6474598840e
  F src/test4.c 4533b76419e7feb41b40582554663ed3cd77aaa54e135cf76b3205098cd6e664
@@@ -790,7 -801,7 +803,7 @@@ F src/test_schemapool.c ae21a79f9bc7e90
  F src/test_sqllog.c 540feaea7280cd5f926168aee9deb1065ae136d0bbbe7361e2ef3541783e187a
  F src/test_superlock.c 4839644b9201da822f181c5bc406c0b2385f672e
  F src/test_syscall.c 9fdb13b1df05e639808d44fcb8f6064aaded32b6565c00b215cfd05a060d1aca
- F src/test_tclsh.c 15c29f9eb00907b361c2c3b11d0897256c8eeef3bdc5f1f169db044ab96b18e7
 -F src/test_tclsh.c aaf0d1de4a518a8db5ad38e5262be3e48b4a74ad1909f2dba753cecb30979d5d
++F src/test_tclsh.c 9dd3005a792e3fe8759d5b2716e1a452eaafcc8c67c8f3b711fe9fefe07e085f
  F src/test_tclvar.c 3273f9d59395b336e381b53cfc68ec6ebdaada4e93106a2e976ffb0550504e1c
  F src/test_thread.c 7ddcf0c8b79fa3c1d172f82f322302c963d923cdb503c6171f3c8081586d0b01
  F src/test_vdbecov.c f60c6f135ec42c0de013a1d5136777aa328a776d33277f92abac648930453d43
@@@ -801,33 -812,33 +814,33 @@@ F src/test_windirent.h da2e5b73c32d0990
  F src/test_window.c cdae419fdcea5bad6dcd9368c685abdad6deb59e9fc8b84b153de513d394ba3f
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
- F src/tokenize.c 23d9f4539880b40226254ad9072f4ecf12eb1902e62aea47aac29928afafcfd5
+ F src/tokenize.c 3f703cacdab728d7741e5a6ac242006d74fe1c2754d4f03ed889d7253259bd68
  F src/treeview.c c6fc972683fd00f975d8b32a81c1f25d2fb7d4035366bf45c9f5622d3ccd70ee
 -F src/trigger.c 0905b96b04bb6658509f711a8207287f1315cdbc3df1a1b13ba6483c8e341c81
 +F src/trigger.c fce5a48596e30c9517357f533b5726120906e446e9d0ddaa180c8c60b9e14c01
  F src/update.c 6904814dd62a7a93bbb86d9f1419c7f134a9119582645854ab02b36b676d9f92
- F src/upsert.c fa125a8d3410ce9a97b02cb50f7ae68a2476c405c76aa692d3acf6b8586e9242
+ F src/upsert.c 2e60567a0e9e8520c18671b30712a88dc73534474304af94f32bb5f3ef65ac65
  F src/utf.c f23165685a67b4caf8ec08fb274cb3f319103decfb2a980b7cfd55d18dfa855e
- F src/util.c 078f040366d5bd5f47658d045f901c768c1c636c6eaea121f3a1cbd63c3edb5b
+ F src/util.c f27a17e6e43fa362abea4db507a1c409f0adc8048ecf4c6479e8d162158ed529
 -F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104
 -F src/vdbe.c da8407be6055f5751bf85681542d130a320b4fd1f4d8719bf83a464743d9aae4
 -F src/vdbe.h c2d78d15112c3fc5ab87f5e8e0b75d2db1c624409de2e858c3d1aafb1650bb4f
 +F src/vacuum.c 5bc892883611a65ca75b4129bcf5cf8b0908564b357373fdeee364d3b1af7cd7
- F src/vdbe.c afc1fc6bafad41aa9b226fac3138e5afd2d16f0080bcccb7f77826085fc0202e
- F src/vdbe.h 723b044424f059f83b077a133c3576fd8eb7b09c20e5fdd4a8f1f43df503d486
++F src/vdbe.c 9ec10717109354aaf52d779ee09e1860a9ea7e1756fcc6561ee7a69e52b6e688
++F src/vdbe.h fe29af5e25afab09947201d417d2ca7b7bbca4a58bf80f3f40b7d6bb4ae33245
  F src/vdbeInt.h 949669dfd8a41550d27dcb905b494f2ccde9a2e6c1b0b04daa1227e2e74c2b2c
  F src/vdbeapi.c 8f57d60c89da0b60e6d4e272358c511f6bae4e24330bdb11f8b42f986d1bf21b
- F src/vdbeaux.c e04464a29b4775cba074a0a5d4e8ea0e988c5c1b05cd01f280f62108893fb7bd
 -F src/vdbeaux.c 6385727adf51a649e4993098870a62c3945fe21dbc0e0fd9013772aff930b8fb
 -F src/vdbeblob.c 13f9287b55b6356b4b1845410382d6bede203ceb29ef69388a4a3d007ffacbe5
++F src/vdbeaux.c 1222d1b7834fa4b1dd04b84fa9dd6fc226c17bb1487ecf44cb1a95d30e9e27c8
 +F src/vdbeblob.c 968d66a7dbeeb4036997db8bc02162429de0f068846759b781bc30e7345f864a
- F src/vdbemem.c 0012d5f01cc866833847c2f3ae4c318ac53a1cb3d28acad9c35e688039464cf0
+ F src/vdbemem.c 213bf303826c0ef702e3a2a69dab2309d84b8381b822c6787885859fd7cd4c4e
  F src/vdbesort.c 237840ca1947511fa59bd4e18b9eeae93f2af2468c34d2427b059f896230a547
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
  F src/vdbevtab.c 2143db7db0ceed69b21422581f434baffc507a08d831565193a7a02882a1b6a7
- F src/vtab.c d660d9dd464b044171f4bd61a1dcec6e3c35374c57d4d487f41e4df9d840a5e6
 -F src/vtab.c 38fcf63832f7e606755fa47b028c2eb6d6cd5facb40e280d66fbda4ed9a52188
++F src/vtab.c f0ff40a7d1bb182b6c2987ddb33ba611cf7a5e1bd35313c04dd0f5df9fc78970
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
  F src/wal.c 887fc4ca3f020ebb2e376f222069570834ac63bf50111ef0cbf3ae417048ed89
  F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
  F src/walker.c 7c7ea0115345851c3da4e04e2e239a29983b61fb5b038b94eede6aba462640e2
- F src/where.c 976ece3d2a716bbb64a6600cf2b3b27295282481f0669ab50bcbb6506c7f3d5f
 -F src/where.c 33eaaeef3aef10c2b9e82096e70a174d6636e35cb0b180321b8ddf804590e5cd
++F src/where.c 6e171826508b08356a3a103a6739eb538d755578fdc1dbf5db84f574672db672
  F src/whereInt.h 82a13766f13d1a53b05387c2e60726289ef26404bc7b9b1f7770204d97357fb8
  F src/wherecode.c 5d77db30a2a3dd532492ae882de114edba2fae672622056b1c7fd61f5917a8f1
- F src/whereexpr.c dc5096eca5ed503999be3bdee8a90c51361289a678d396a220912e9cb73b3c00
+ F src/whereexpr.c 6ebd90b553f4bb5c7df5a4b2f39b6a7c81a67484353827cdd2048f2514ec6f30
  F src/window.c 5b1387d59df30d481ed14cceef5f4d1dab1f8752aa106ba72c8b62777bd139d2
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
@@@ -1589,15 -1600,15 +1609,15 @@@ F test/sharedA.test 64bdd21216dda2c6a3b
  F test/sharedB.test 1a84863d7a2204e0d42f2e1606577c5e92e4473fa37ea0f5bdf829e4bf8ee707
  F test/shared_err.test 32634e404a3317eeb94abc7a099c556a346fdb8fb3858dbe222a4cbb8926a939
  F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
- F test/shell1.test c7127a5e780ffc9e14c476773127fdf292c6db226529c44c1676f37b3793123f
- F test/shell2.test 35226c070a8c7f64fd016dfac2a0db2a40f709b3131f61daacd9dad61536c9cb
- F test/shell3.test 91febeac0412812bf6370abb8ed72700e32bf8f9878849414518f662dfd55e8a
- F test/shell4.test 947029e5a9efae9054d424b309fc0311439c0c3a0866ebfa3b8a771120708220
- F test/shell5.test c8b6c54f26ec537f8558273d7ed293ca3725ef42e6b12b8f151718628bd1473b
- F test/shell6.test 1ceb51b2678c472ba6cf1e5da96679ce8347889fe2c3bf93a0e0fa73f00b00d3
- F test/shell7.test 115132f66d0463417f408562cc2cf534f6bbc6d83a6d50f0072a9eb171bae97f
- F test/shell8.test 3fd093d481aaa94dc77fb73f1044c1f19c7efe3477a395cc4f7450133bc54915
- F test/shell9.test f457a96c088344908e0518dbabffd02eda8ac2a8733f278679e5f47c103efbab
+ F test/shell1.test 17a5ca9c6f24f807b2f505b4b38fcbce143d96cd8664c06c34bbbe0672bf7c30
+ F test/shell2.test 56da24128304c9ab67da2964cc80beff7b35761c446ec6e6e98bff2775b15026
+ F test/shell3.test 5ad4b2813717956414f2c0c8a2027895cd98ccf7dd54dbacbde4d4f5591ce5a1
+ F test/shell4.test 522fdc628c55eff697b061504fb0a9e4e6dfc5d9087a633ab0f3dd11bcc4f807
+ F test/shell5.test 5b2ab1c0540217773f939927c24163a56257446da3f564d4724042620bfea762
+ F test/shell6.test e3b883b61d4916b6906678a35f9d19054861123ad91b856461e0a456273bdbb8
+ F test/shell7.test 753c6ece5361df50025a50cadf378ea36db9cc05fb23d7a96cff7fa130626ef9
+ F test/shell8.test 9b71d56a6f6fc62edd9163534ac21eaa328ad95f1b9026e7bd08d5b4621eacf6
 -F test/shell9.test 8742a5b390cdcef6369f5aa223e415aa4255a4129ef249b177887dc635a87209
++F test/shell9.test 8030c6246e1ca474c65eb0e955324586bfbf3448289c99ca247fc7f62006ac2c
  F test/shmlock.test 3dbf017d34ab0c60abe6a44e447d3552154bd0c87b41eaf5ceacd408dd13fda5
  F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
  F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
@@@ -1675,9 -1686,9 +1695,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 fe617b88c7eb08bdf983d2aaa31c20fbf439eee7b8e0d61ca636fcd0c305bbbf
 +F test/tester.tcl ad2bf61b6676442e106c147f6d8b3735a61478f7c6ee9916178139efafc39232
- F test/testrunner.tcl 8e2a5c7550b78d3283eee6103104ae2bcf56aa1df892dbd1608f27b93ebf4de8
- F test/testrunner_data.tcl 7ffd951527bbc614e723fd8d123b6834321878530696adecfdf6035100bac64e
+ F test/testrunner.tcl 48e33d99f0bad37a03b8a4064a44184de4c4ed8cd2e3174fef8d7c5f4e28ecc3
+ F test/testrunner_data.tcl 2f94974e5e3a56af880be72f7a7fd239aa9d4ecf978625435fcc698319c927fa
  F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
  F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1865,16 -1876,15 +1885,16 @@@ F test/triggerF.test 5d76f0a8c428ff87a4
  F test/triggerG.test 2b816093c91ba73c733cfa8aedcc210ad819d72a98b1da30768a3c56505233e9
  F test/triggerupfrom.test d1f9e56090408115c522bee626cc33a2f3370f627a5e341d832589d72e3aa271
  F test/trustschema1.test d2996bb284859c99956ac706160eab9f086919da738d19bfef3ac431cce8fd47
 -F test/tt3_checkpoint.c ac7ca661d739280c89d9c253897df64a59a49369bd1247207ac0f655b622579d
 -F test/tt3_index.c 39eec10a35f57672225be4d182862152896dee4a
 -F test/tt3_lookaside1.c 0377e202c3c2a50d688cb65ba203afeda6fafeb9
 +F test/tt3_checkpoint.c 69214e2ce81bbbd3c1b82c31e103607fd2e6790818aef4792957fc9cc88d067e
 +F test/tt3_index.c 95592839426dc85ce5a7a57b41be2cbf3c2ec3457b9cd841a06ed5877f712c7c
 +F test/tt3_lookaside1.c 2ddd99bfffeef288f0786827ef68f912f6f47ce3d3184e62f05808d8e13b920e
 +F test/tt3_reuseschema.c 4d52e141f89f009028d8ab0bd1f0697d0edffa94bafc1fff0f7ad4d9d9baa549
  F test/tt3_shared.c b37d22defc944a2ac4c91c927fd06c1d48cd51e2ce9d004fe868625bd2399f93
 -F test/tt3_stress.c f9a769ca8b026ecc76ee93ca8c9700a5619f8e51c581107c4053ba6ac97f616f
 -F test/tt3_vacuum.c 71b254cde1fc49d6c8c44efd54f4668f3e57d7b3a8f4601ade069f75a999ba39
 +F test/tt3_stress.c 077e817ac1168443b075fedb44e92db84bb4dc5bd3b6fe1aba25c94ac280b231
 +F test/tt3_vacuum.c 727bfda1299b18435eeba80dee8e6ff43462146d7c1e2096cc809f01db568391
  F test/types.test bf816ce73c7dfcfe26b700c19f97ef4050d194ff
  F test/types2.test 1aeb81976841a91eef292723649b5c4fe3bc3cac
- F test/types3.test 99e009491a54f4dc02c06bdbc0c5eea56ae3e25a
+ F test/types3.test c9db8f9e80309edfa4252585cf16bcab7ed31f39eeb904d21e831199a3613fb0
  F test/unhex.test b7f1b806207cb77fa31c3e434fe92fba524464e3e9356809bfcc28f15af1a8b7
  F test/unionall.test 5b1c4186a661e4bf762875caf4c61d8fda3dd04a6fa9005187f6ba8900c2913f
  F test/unionall2.test 71e8fa08d5699d50dc9f9dc0c9799c2e7a6bb7931a330d369307a4df7f157fa1
@@@ -2091,9 -2101,9 +2111,9 @@@ F tool/mkctimec.tcl a16682eae5f01f85e58
  F tool/mkkeywordhash.c b9faa0ae7e14e4dbbcd951cddd786bf46b8a65bb07b129ba8c0cfade723aaffd
  F tool/mkmsvcmin.tcl 8897d515ef7f94772322db95a3b6fce6c614d84fe0bdd06ba5a1c786351d5a1d
  F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef
- F tool/mkopcodeh.tcl 769d9e6a8b462323150dc13a8539d6064664b72974f7894befe2491cc73e05cd
+ F tool/mkopcodeh.tcl 2b4e6967a670ef21bf53a164964c35c6163277d002a4c6f56fa231d68c88d023
  F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
 -F tool/mkpragmatab.tcl 32e359ccb21011958a821955254bd7a5fa7915d01a8c16fed91ffc8b40cb4adf
 +F tool/mkpragmatab.tcl ae506d2d7b22094dc94a0f8cdb612dd4896e87ced649515f1709d784d7bdd595
  F tool/mkshellc.tcl b7adf08b82de60811d2cb6af05ff59fc17e5cd6f3e98743c14eaaa3f8971fed0
  F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
@@@ -2167,8 -2177,8 +2187,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P e07f2451e8efe332ca94499b5a6104243b258efc0b037b4c3596aa4584c92037 f47a5f4e0ce078e6cc1183e6cbb3c4013af379b496efae94863a42e5c39928ed
- R 443bf2ae4399eafe267da670a0a4eb8c
- U dan
- Z 81e2c9d56c56ffefca05aa9e8abf1502
 -P 5a7b5fc99a9d5c7693a5707c2050a8c59a8f97732e4763a56982579f8d5959ec
 -R 407830b5c90e1eed2d3fe5c7fa3b86c4
++P bb9a71574883084a1d54bdef2064931de41f31291d025827c80383fa9127c5f1 924281b94d8e6ba674d6fe2f7f01da890351355a854e9e6fe623fad1180f7392
++R 8d8d31929fb58408ec862af350c67f6b
+ U drh
 -Z 7cb4f1a4becd0bff0730a94c93a2e20f
++Z 16b3f4148e999b3c144b44458a161f4c
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index b9ffdd0a5c,a1fceec15d..5e020d2a06
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- bb9a71574883084a1d54bdef2064931de41f31291d025827c80383fa9127c5f1
 -924281b94d8e6ba674d6fe2f7f01da890351355a854e9e6fe623fad1180f7392
++70ef3784f678e29a7b067e557f69ca0a14e7823c344bb438dc4373a454389218
diff --cc src/shell.c.in
index 12f0f98482,9fdf909523..fa4d81f9cf
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@@ -7576,277 -7577,8 +7589,277 @@@ end_ar_command
  *******************************************************************************/
  #endif /* !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_HAVE_ZLIB) */
  
 -#if SQLITE_SHELL_HAVE_RECOVER
 +/*
 +** If (*pRc) is not SQLITE_OK when this function is called, it is a no-op.
 +** Otherwise, the SQL statement or statements in zSql are executed using
 +** database connection db and the error code written to *pRc before
 +** this function returns.
 +*/
 +static void shellExec(sqlite3 *db, int *pRc, const char *zSql){
 +  int rc = *pRc;
 +  if( rc==SQLITE_OK ){
 +    char *zErr = 0;
 +    rc = sqlite3_exec(db, zSql, 0, 0, &zErr);
 +    if( rc!=SQLITE_OK ){
-       raw_printf(stderr, "SQL error: %s\n", zErr);
++      sputf(stderr, "SQL error: %s\n", zErr);
 +    }
 +    sqlite3_free(zErr);
 +    *pRc = rc;
 +  }
 +}
 +
 +/*
 +** Like shellExec(), except that zFmt is a printf() style format string.
 +*/
 +static void shellExecPrintf(sqlite3 *db, int *pRc, const char *zFmt, ...){
 +  char *z = 0;
 +  if( *pRc==SQLITE_OK ){
 +    va_list ap;
 +    va_start(ap, zFmt);
 +    z = sqlite3_vmprintf(zFmt, ap);
 +    va_end(ap);
 +    if( z==0 ){
 +      *pRc = SQLITE_NOMEM;
 +    }else{
 +      shellExec(db, pRc, z);
 +    }
 +    sqlite3_free(z);
 +  }
 +}
 +
 +static int sharedSchemaFix(ShellState *pState, const char *zDb){
 +  int rc = SQLITE_OK;
 +  i64 iLast = 0;
 +  int iCookie = 0;
 +  int iAutoVacuum = 0;
 +  sqlite3_stmt *pStmt = 0;
 +
 +  shellExecPrintf(pState->db, &rc, "ATTACH '%q' AS _shared_schema_tmp", zDb);
 +  shellExecPrintf(pState->db, &rc, "PRAGMA writable_schema = 1");
 +  shellExecPrintf(pState->db, &rc, "BEGIN");
 +  shellPreparePrintf(pState->db, &rc, &pStmt, 
 +      "SELECT max(rowid) FROM _shared_schema_tmp.sqlite_master"
 +  );
 +  sqlite3_step(pStmt);
 +  iLast = sqlite3_column_int64(pStmt, 0);
 +  shellFinalize(&rc, pStmt);
 +  shellPreparePrintf(pState->db, &rc, &pStmt,
 +      "INSERT INTO _shared_schema_tmp.sqlite_master SELECT "
 +      "  type, name, tbl_name, ("
 +      "    SELECT rootpage FROM _shared_schema_tmp.sqlite_master WHERE "
 +      "      type IS o.type AND name IS o.name AND rowid<=?"
 +      "  ), sql FROM main.sqlite_master AS o"
 +  );
 +  sqlite3_bind_int64(pStmt, 1, iLast);
 +  sqlite3_step(pStmt);
 +  shellFinalize(&rc, pStmt);
 +
 +  shellExecPrintf(pState->db, &rc,
 +      "DELETE FROM _shared_schema_tmp.sqlite_master WHERE rowid<=%lld",
 +      iLast
 +  );
 +  shellExecPrintf(pState->db, &rc, "COMMIT");
 +  sqlite3_exec(pState->db, "PRAGMA writable_schema = 0", 0, 0, 0);
 +
 +  /* Copy the auto-vacuum setting from main to the target db */
 +  shellPreparePrintf(pState->db, &rc, &pStmt, "PRAGMA main.auto_vacuum");
 +  sqlite3_step(pStmt);
 +  iAutoVacuum = sqlite3_column_int(pStmt, 0);
 +  shellFinalize(&rc, pStmt);
 +  shellExecPrintf(pState->db, &rc, 
 +      "PRAGMA _shared_schema_tmp.auto_vacuum = %d", iAutoVacuum
 +  );
 +
 +  /* Vacuum the db in order to standardize the rootpage numbers. */
 +  shellExecPrintf(pState->db, &rc, "VACUUM _shared_schema_tmp");
 +
 +  /* Set the schema-cookie value to the same as database "main" */
 +  shellPreparePrintf(pState->db, &rc, &pStmt, "PRAGMA main.schema_version");
 +  sqlite3_step(pStmt);
 +  iCookie = sqlite3_column_int(pStmt, 0);
 +  shellFinalize(&rc, pStmt);
 +  shellExecPrintf(pState->db, &rc, 
 +      "PRAGMA _shared_schema_tmp.schema_version = %d", iCookie
 +  );
 +
 +  sqlite3_exec(pState->db, "DETACH _shared_schema_tmp", 0, 0, 0);
 +  return rc;
 +}
 +
 +static int sharedSchemaCheck(ShellState *pState, const char *zDb, int *peFix){
 +  int rc = SQLITE_OK;
 +  int bFailed = 0;
 +  sqlite3_stmt *pStmt = 0;
 +
 +  if( peFix ) *peFix = 0;
 +  shellExecPrintf(pState->db, &rc, "ATTACH '%q' AS _shared_schema_tmp", zDb);
 +
 +  /* Check if this database has the same set of objects as the current db */
 +  shellPreparePrintf(pState->db, &rc, &pStmt, 
 +    "SELECT type, name FROM _shared_schema_tmp.sqlite_master AS o "
 +    "WHERE NOT EXISTS ("
 +    "  SELECT 1 FROM main.sqlite_master "
 +    "    WHERE name IS o.name AND type IS o.type"
 +    ")"
 +    " UNION ALL "
 +    "SELECT type, name FROM main.sqlite_master AS o "
 +    "WHERE NOT EXISTS ("
 +    "  SELECT 1 FROM _shared_schema_tmp.sqlite_master "
 +    "    WHERE name IS o.name AND type IS o.type"
 +    ")"
 +  );
 +  if( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){
-     utf8_printf(pState->out, "%s is NOT compatible (objects)\n", zDb);
++    sputf(pState->out, "%s is NOT compatible (objects)\n", zDb);
 +    bFailed = 1;
 +  }
 +  shellFinalize(&rc, pStmt);
 +
 +  /* Check if this database has the same set of SQL statements as the 
 +  ** current db. */
 +  if( bFailed==0 ){
 +    shellPreparePrintf(pState->db, &rc, &pStmt, 
 +        "SELECT 1 FROM _shared_schema_tmp.sqlite_master AS o "
 +        "WHERE sql IS NOT ("
 +        "  SELECT sql FROM main.sqlite_master "
 +        "    WHERE name IS o.name AND type IS o.type"
 +        ")"
 +    );
 +    if( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){
-       utf8_printf(pState->out, "%s is NOT compatible (SQL)\n", zDb);
++      sputf(pState->out, "%s is NOT compatible (SQL)\n", zDb);
 +      bFailed = 1;
 +    }
 +    shellFinalize(&rc, pStmt);
 +  }
 +
 +  /* Check if this database has the same set of root pages as the current 
 +  ** db. */
 +  if( bFailed==0 ){
 +    shellPreparePrintf(pState->db, &rc, &pStmt, 
 +        "SELECT 1 FROM _shared_schema_tmp.sqlite_master AS o "
 +        "WHERE rootpage IS NOT ("
 +        "  SELECT rootpage FROM main.sqlite_master "
 +        "    WHERE name IS o.name AND type IS o.type"
 +        ")"
 +    );
 +    if( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){
 +      if( peFix==0 ){
-         utf8_printf(pState->out, "%s is NOT compatible (root pages)\n", zDb);
++        sputf(pState->out, "%s is NOT compatible (root pages)\n", zDb);
 +      }
 +      bFailed = 1;
 +      if( peFix ) *peFix = 1;
 +    }
 +    shellFinalize(&rc, pStmt);
 +  }
 +
 +  if( bFailed==0 ){
 +    shellPreparePrintf(pState->db, &rc, &pStmt, 
 +        "SELECT 1 WHERE ("
 +        "  SELECT group_concat(rootpage || '.' || name || '.' || sql, '.') "
 +        "  FROM _shared_schema_tmp.sqlite_master"
 +        ") IS NOT ("
 +        "  SELECT group_concat(rootpage || '.' || name || '.' || sql, '.') "
 +        "  FROM main.sqlite_master"
 +        ")"
 +    );
 +    if( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){
 +      if( peFix==0 ){
-         utf8_printf(pState->out, 
++        sputf(pState->out, 
 +            "%s is NOT compatible (order of sqlite_master rows)\n", zDb
 +        );
 +      }
 +      bFailed = 1;
 +      if( peFix ) *peFix = 2;
 +    }
 +    shellFinalize(&rc, pStmt);
 +  }
 +
 +  if( bFailed==0 ){
 +    int iMain = -1;
 +    int iNew = +1;
 +    shellPreparePrintf(pState->db, &rc, &pStmt, 
 +        "PRAGMA main.schema_version"
 +    );
 +    if( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){
 +      iMain = sqlite3_column_int(pStmt, 0);
 +    }
 +    shellFinalize(&rc, pStmt);
 +    shellPreparePrintf(pState->db, &rc, &pStmt, 
 +        "PRAGMA _shared_schema_tmp.schema_version"
 +    );
 +    if( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){
 +      iNew = sqlite3_column_int(pStmt, 0);
 +    }
 +    shellFinalize(&rc, pStmt);
 +    if( rc==SQLITE_OK && iMain!=iNew ){
 +      if( peFix==0 ){
-         utf8_printf(pState->out, 
++        sputf(pState->out, 
 +            "%s is NOT compatible (schema cookie)\n", zDb
 +        );
 +      }
 +      bFailed = 1;
 +      if( peFix ) *peFix = 3;
 +    }
 +  }
 +
 +  if( rc==SQLITE_OK && bFailed==0 ){
-     utf8_printf(pState->out, "%s is compatible\n", zDb);
++    sputf(pState->out, "%s is compatible\n", zDb);
 +  }
 +
 +  sqlite3_exec(pState->db, "DETACH _shared_schema_tmp", 0, 0, 0);
 +  return rc;
 +}
 +
 +/*
 +** .shared-schema check|fix DB1 DB2...
 +*/
 +static int sharedSchemaDotCommand(
 +  ShellState *pState,             /* Current shell tool state */
 +  char **azArg,                   /* Array of arguments passed to dot command */
 +  int nArg                        /* Number of entries in azArg[] */
 +){
 +  int rc = SQLITE_OK;
 +  int bFix = 0;                   /* Fix databases if possible */
 +  int n1;
 +  int i;
 +  if( nArg<3 ){
 +    goto shared_schema_usage;
 +  }
 +
 +  n1 = (int)strlen(azArg[1]);
 +  if( n1>0 && n1<=3 && memcmp("fix", azArg[1], n1)==0 ){
 +    bFix = 1;
 +  }else if( n1==0 || n1>5 || memcmp("check", azArg[1], n1) ){
 +    goto shared_schema_usage;
 +  }
 +
 +  for(i=2; rc==SQLITE_OK && i<nArg; i++){
 +    int eFix = 0;
 +    rc = sharedSchemaCheck(pState, azArg[i], bFix ? &eFix : 0);
 +    if( rc==SQLITE_OK && bFix && eFix ){
-       utf8_printf(pState->out, "Fixing %s... ", azArg[i]);
++      sputf(pState->out, "Fixing %s... ", azArg[i]);
 +      fflush(pState->out);
 +      rc = sharedSchemaFix(pState, azArg[i]);
 +      if( rc==SQLITE_OK ){
 +        rc = sharedSchemaCheck(pState, azArg[i], &eFix);
 +        if( rc==SQLITE_OK && eFix ){
-           utf8_printf(pState->out, "VACUUMing main... ");
++          sputf(pState->out, "VACUUMing main... ");
 +          fflush(pState->out);
 +          rc = sqlite3_exec(pState->db, "VACUUM main", 0, 0, 0);
 +          if( rc==SQLITE_OK ){
 +            rc = sharedSchemaCheck(pState, azArg[i], 0);
 +          }
 +        }
 +      }
 +    }
 +  }
 +
 +  return rc;
 + shared_schema_usage:
-   raw_printf(stderr, "usage: .shared-schema check|fix DB1 DB2...\n");
++  sputf(stderr, "usage: .shared-schema check|fix DB1 DB2...\n");
 +  return SQLITE_ERROR;
 +}
  
 +#if SQLITE_SHELL_HAVE_RECOVER
  /*
  ** This function is used as a callback by the recover extension. Simply
  ** print the supplied SQL statement to stdout.
diff --cc test/shell9.test
index 34c9d8c5d6,869cb075da..147aa381f4
--- a/test/shell9.test
+++ b/test/shell9.test
@@@ -71,9 -72,9 +72,10 @@@ do_execsql_test 1.2.1 
    CREATE TABLE t4(hello);
  }
  db close
--do_test 1.2.2 {
--  catchcmd test.db ".read testdump.txt"
--} {1 {Parse error near line 5: table sqlite_master may not be modified}}
++# This works ok on the reuse-schema branch
++# do_test 1.2.2 {
++#   catchcmd test.db ".read testdump.txt"
++# } {1 {Parse error near line 5: table sqlite_master may not be modified}}
  
  # Check testdump.txt cannot be processed if the db is in safe mode
  #