Merge recent trunk enhancements into the reuse-schema branch.

FossilOrigin-Name: 64234c5c9a5709e7c7c1b18bf32f4374692129b353c4698010abfc98bd00bcc4

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 0d262ad1a21fbee56e816a916f21f9e18a780e60,cd1aa495ea3f1d92d027710ed5359e9ccb12ed93..bfb38b6ed425080c7a662ccde0b0d70f8987eebc
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
 -C Fix\squery\splans\screated\sby\swhereShortCut()\sso\sthat\sthey\salways\scheck\ntransitive\sconstraints\sthat\sdrive\san\sindex.\s\sThe\sis\sanalogous\sto\sthe\n[f1f9b5de3c59489b]\scheck-in,\sjust\sfor\swhereShortCut()\srather\sthan\sthe\nfull\squery\splanner.\sFix\sfor\sthe\sissue\sdescribed\sby\n[forum:/forumpost/a65cacbf5e1c41ba|forum\spost\sa65cacbf5e1c41ba].
 -D 2021-10-04T11:10:15.125
 +C Merge\srecent\strunk\senhancements\sinto\sthe\sreuse-schema\sbranch.
- D 2021-08-09T18:17:26.144
++D 2021-10-04T11:49:35.957
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in 27da61b991eee661f56262465d6feb3e4932904dda729cb9add349efff49c445
 -F Makefile.in 2a6e71e91f29e9eb0cb800b6500bbbfef31730d5c37eaadb6e8ea8a45e6ead21
++F Makefile.in c5fd8f6f963de95afe68340d98708bc6043b71a8f0edf7d76a1ccbc4be3c6cc7
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
- F Makefile.msc c1241e5f498c1a7088758430c20e2f228ab25bc5ac4d7a96b367b119f3b99ced
 -F Makefile.msc b18738be47ba9293dbea2048fe1d5a737456fdc630361cc98ef2c2f73bf3395c
++F Makefile.msc 9a5844f43ca9dcc792d036c86b501d8aa9d8fe14ef48ce1ce355f5eacc55f887
  F README.md 27fb76aa7eb57ed63a53bbba7292b6bf71f51125554f79f16b5d040edd1e6110
  F VERSION c6595fef606851f2bc3ebed6a7386c73751835fc909feab7c093739fa4b3c1d1
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -467,7 -471,7 +472,7 @@@ F ext/userauth/userauth.c 7f00cded7dcaa
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 0d98192758cdb5d3766f5ce5d0fddea9ca201bdbd990a9eb98ebe79baba89ef0
 -F main.mk 002e77acdfeb08d1d8f4d360b01e130aa243fb5701728e81fac9085794f27155
++F main.mk 2a87e919ae96ab47f20b0c4e6568a58071233fe7306afa56b925a356e5c26399
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -479,38 -483,38 +484,38 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
- F src/alter.c 618d0c615e44d3f57259530cf4737a9eeb6c381133a804e41e2b4e1706fe4a57
- F src/analyze.c da68cbd52e696dca799da27c30721b604a55e156fdeb232be7bc5ef2618de7c3
 -F src/alter.c a6afe961ef3544104fa635a0c3161bfe1a34382f32e2a28706993abadedbffed
 -F src/analyze.c 979b6d2cdaca992a9c9f0818de55d08fb9a4e52929a509752b52d9fd23bb86d3
 -F src/attach.c a514e81758ba7b3a3a0501faf70af6cfc509de8810235db726cfc9f25165e929
++F src/alter.c aa59bacdcd7716eae842999467542f3bf14e73a691e9462acdb3217151de96aa
++F src/analyze.c 352b3db73a36d3ddd26c511e9d913787adaabb1aa068589601512cfd9b0f49c0
 +F src/attach.c 74fab1b71a5fef866eae143aa5fa8c66174a4aa5829189764948e621ad3adbd6
  F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
  F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c e204a9c8fb4fe5dbb910a863ba487f4af9b5c501254ec4ccbfcdd6b1f65b7fb4
+ F src/btree.c ced03fe226a3a42b77b504afcd0a9da14da39b42fac5935988243803cf03bc14
  F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
  F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae0
- F src/build.c 336ecd22dc408b6935d2362b40e21070ef31e088d29c97d68cc6f4df74878c1d
 -F src/build.c ee6941680fa2ab0461d9be145a546f8659f6543af643ace0b44d08abdf85e001
 -F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
++F src/build.c 034d67c88857fc3014c64e4cb95eaa26710e8bdab6ef15fc610bd776075a319b
 +F src/callback.c 38b73a7a594b5b9fd322acf0a7a0e614bbc9a2edaecab437eb1d8b6d79afba3b
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 -F src/ctime.c 8159d5f706551861c18ec6c8f6bdf105e15ea00367f05d9ab65d31a1077facc1
 +F src/ctime.c 22b5ea591c18d677b521a99d375dfc626917bc23786c5f52aca113924b8edb9e
- F src/date.c e0632f335952b32401482d099321bbf12716b29d6e72836b53ae49683ebae4bf
+ F src/date.c 467848d8187382764e37fd7678d6825cdfb90d9e564648527ed832e999ea7b85
  F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
- F src/dbstat.c 3aa79fc3aed7ce906e4ea6c10e85d657299e304f6049861fe300053ac57de36c
+ F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
  F src/delete.c 3ce6af6b64c8b476de51ccc32da0cb3142d42e65754e1d8118addf65b8bcba15
- F src/expr.c e98375fc63552cc8cdd36a41bdca3039cb603d9fe67abd9c9f40adae8405fbc5
+ F src/expr.c ebc76aa98b9bcd556c2855942c18f4d2f52c6504c13f7285413026bdd1c7bbf5
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c 1905af1821b88321e1bb9d6a69e704495b6844a9b6c29398d40117cc251e893c
- F src/func.c c224240cbc97fa5e9c4fe9acb128716cb835ca045532bca6951b7c45b020c56c
- F src/global.c 5eba017ebbd887e2365e6e6e815e1619e41406b8946d17594e94116174787df5
+ F src/func.c 761a989e9b6a1f03cae05ef274f30881cb8f7ec816af2913b58dc18ac31ffd0e
+ F src/global.c 612ea60c9acbcb45754c2ed659b4a56936a06814718e969636fedc7e3b889808
  F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
  F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
  F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 4ebff642574d3866316439b3dfce165f80e130e8969853c656d71b2afc5dd73c
+ F src/insert.c 16fa4b66709db6db5bb31475f2321d0a839269765aa2461a520c151c385e8b9d
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 0aa9e7f08e168e3874cb54984408e3976dafdf5616d511952c425b5ac088ea3e
- F src/main.c 6e86cafdd62cb4b9a9c0166c0771907b77252bb7751b4e0bce2d14efffa6538f
- F src/malloc.c cbc93cdd429c4594912017d92ab656e2579aca64dbd1c6888551275bed46f25b
 -F src/main.c ff4c89bdfd980b59126d3f6ed4677b1e79fcb93fb72d09908019d533fd0ff134
++F src/main.c 29777eb1c99214cf12047f139322ef4a491ddf29296236ba94a4bbb1f887077e
+ F src/malloc.c ef796bcc0e81d845d59a469f1cf235056caf9024172fd524e32136e65593647b
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
  F src/mem2.c b93b8762ab999a29ae7751532dadf0a1ac78040308a5fb1d17fcc365171d67eb
@@@ -532,29 -536,29 +537,29 @@@ F src/os_setup.h 0dbaea40a7d36bf311613d
  F src/os_unix.c b11e4610769922253dec27d7af4a07ff84f65169d19bda5e9b12a152a706f7f5
  F src/os_win.c 77d39873836f1831a9b0b91894fec45ab0e9ca8e067dc8c549e1d1eca1566fe9
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 95c255256b13827caf038c8f963d334784073f38ab6ef9d70371d9d04f3c43e0
+ F src/pager.c dabb867aa4fabe01d05a5fb39c4d497b2d7bff591b738ffbe7f715ee28b67cdb
  F src/pager.h 4bf9b3213a4b2bebbced5eaa8b219cf25d4a82f385d093cd64b7e93e5285f66f
- F src/parse.y 0ba0baec5de6921ec8ba8bbcf1018969144ef29d26112e17539d8fbb1662e3eb
- F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
+ F src/parse.y 82bdd593c50bddcc285a173e9788a20296103217f5f5290c9122abf8af71af62
+ F src/pcache.c 084e638432c610f95aea72b8509f0845d2791293f39d1b82f0c0a7e089c3bb6b
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
- F src/pcache1.c 00541fef31d2798dc20308ee1fa46205b76ad1df2c871e9c9bfe9508e59ab54c
- F src/pragma.c 0d91c5dd6c8f5088ec67962fc5730a0947d238bae5dd8b9b5290e136778ae9d7
- F src/pragma.h 6c85e80048ea4a4fa42e769cbfdd252046f83db2c6681cebace54d7bb7c43480
- F src/prepare.c 3668279bfdec5e58e54a284b068d36746efadd5b2ecbb7475f3a1d12a8297653
- F src/printf.c 78fabb49b9ac9a12dd1c89d744abdc9b67fd3205e62967e158f78b965a29ec4b
+ F src/pcache1.c 54881292a9a5db202b2c0ac541c5e3ef9a5e8c4f1c1383adb2601d5499a60e65
 -F src/pragma.c 4a473feae3646063996ce3bfae78032009fa950765908d97424f7578b202813c
 -F src/pragma.h b33c7a542ae7965c471f0d3c0565ce4d340c3f32cc162f44133539b6b0edb927
 -F src/prepare.c 8f07616db04337057b8498b72d051ee90f73c54615c2e908c05404cef1e060b7
++F src/pragma.c a582bc58a7a05caedbbec3965212ad9343a8369bfdb3017f74672bbf35ee6b00
++F src/pragma.h 482ee258d264738041362e7272fd92a09ad53d926f10b9fa38624befabbec528
++F src/prepare.c 5251d1bab075470ff6bc2acca05da8e74a3c81b057c52d27adba18e7172b2dc3
+ F src/printf.c 5901672228f305f7d493cbc4e7d76a61a5caecdbc1cd06b1f9ec42ea4265cf8d
  F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
- F src/resolve.c 42b94d37a54200707a95566eff4f7e8a380e32d080016b699f23bd79a73a5028
+ F src/resolve.c b9e60afa56d0484ee573aba54d9e73603736236df33d2ae3421b4cd0367d907d
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 63077c0243ded1432d97c90c1a4c3419b3a574b36634c674599a68bfe4c3bdc2
- F src/shell.c.in 90e7c6063d6e8abea262beda0e619b893bd3636a88e283e6d4227e58aa2985eb
- F src/sqlite.h.in a10c0512fa8f3cea54a01391d0e559a21873d2a9f3c331198e4fb9e2c1b18727
+ F src/select.c 916d18b586d8efad5a46040e48405f42e7f90fff33bca1cfab040169515ec525
 -F src/shell.c.in 923671ae56ad899db71296d0ebefea9c85e7e52ef087c8a097f3f3a3a3ade98c
 -F src/sqlite.h.in 4e977a5e2ed1a9e8987ff65a2cab5f99a4298ebf040ea5ff636e1753339ff45a
++F src/shell.c.in b6f7cd92701d378382acc99bbd226e1e3d0cfbf494ab4c21f28d2a09ffcfddea
++F src/sqlite.h.in 0b54872eca3326d165a807b8f964e1b3026e26f9d28ee7f2aeb852ea2252eea8
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h e97f4e9b509408fea4c4e9bef5a41608dfac343b4d3c7a990dedde1e19af9510
- F src/sqliteInt.h e36399792ac0acd05c6480cb11b110bf050b913cae929cd8d05ce58e2f6ee285
 -F src/sqliteInt.h e105aa8ec699c8c247117b99080b49c175b013493f9938bd411f00d839a381dc
++F src/sqliteInt.h 149e887c58f288e0bee1ee8da40dfec95f20ceea7ed5c9551fa1c9fa333f840a
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 -F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
 +F src/status.c d0956e57c71160155f620a3efeb1e5c05a3f8b9a897dd09c5263268e5d237579
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
- F src/tclsqlite.c 1ae70091c34402aec6f637ef5646789f68be1169fe4332d6844db0666773cee3
 -F src/tclsqlite.c 428e813dabf82804bc13196af35a0c3c6ef4347fe557fa6717c5c66bba6e8520
++F src/tclsqlite.c 78450c0a24bbd9379a8f4827d830e743d5f884389042d6644e4bcba17fdde952
  F src/test1.c 63761c2be2607f1b425fde991beda48aed384f8d67f2b4ee549174c88b433009
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
@@@ -599,7 -602,7 +604,7 @@@ F src/test_server.c a2615049954cbb9cfb4
  F src/test_sqllog.c 540feaea7280cd5f926168aee9deb1065ae136d0bbbe7361e2ef3541783e187a
  F src/test_superlock.c 4839644b9201da822f181c5bc406c0b2385f672e
  F src/test_syscall.c 1073306ba2e9bfc886771871a13d3de281ed3939
- F src/test_tclsh.c 6cbaaf30c4fed76c7b35baa42c521fd225c49563ff580f736d77def9e216b31b
 -F src/test_tclsh.c c4065ced25126e25c40122c5ff62dc89902ea617d72cdd27765151cdd7fcc477
++F src/test_tclsh.c ec192bceacfe67d427e97d4985a298b0aaadb266dfbc77c54425537c5e263b65
  F src/test_tclvar.c 33ff42149494a39c5fbb0df3d25d6fafb2f668888e41c0688d07273dcb268dfc
  F src/test_thread.c 269ea9e1fa5828dba550eb26f619aa18aedbc29fd92f8a5f6b93521fbb74a61c
  F src/test_vdbecov.c f60c6f135ec42c0de013a1d5136777aa328a776d33277f92abac648930453d43
@@@ -616,19 -619,19 +621,19 @@@ F src/trigger.c db412c9616de92de782540e
  F src/update.c 69c4c10bc6873a80c0a77cb578f9fc60ee90003d03f9530bc3370fa24615772d
  F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
- F src/util.c e9fd5c474691a7c913dfc971f01cf6d3a3d5954db04e0764a6426f845505e692
+ F src/util.c 3f27a1eae01c8bbbb8cdef2f26bd8e6a2a7db08106ef7c3dcc990787a5da6e86
 -F src/vacuum.c 454973a59fb20bb982efc2df568a098616db6328a0491b6e84e2e07f7333db45
 -F src/vdbe.c f2a83da75711ee42b8986600ba870c71f57b49325d9b196c2097950871846983
 -F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
 +F src/vacuum.c 344acf0354037adb6d64451968a4ec0a6a8f81e753acdc5fe852cb4d4fcf4a6a
- F src/vdbe.c 7c72ebe8ef2457c906e78bbd9ad5dec1f628f4be35610bd32c0748fa3568526e
++F src/vdbe.c 571042c58e365eaf3de94d3db2599e25323a463d2632ecef4f33ae7c4de82e4d
 +F src/vdbe.h bfde0b0f429a0ba4203e5319780a6a1c8b2a809c5cd6baa9ae22e257a657b8b3
  F src/vdbeInt.h 38206c8dd6b60ff03d9fd4f626b1b4fd0eef7cdc44f2fc2c1973b0f932a3f26b
  F src/vdbeapi.c aa5aaf2c37676b83af5724c6cd8207a3064ed46a217fd180957f75ac84f7a2a5
 -F src/vdbeaux.c 2368a8888f17368d4040a05966f7d2a2276cac4eeeba50793828186d999e3c8f
 -F src/vdbeblob.c 60a7694760e35b2bba166cf49eb6a1eb0b31581102b49de78008ca3032406065
 +F src/vdbeaux.c a133350fa97ca98ad4c1fb1e0cc11c677c09a74df0717384ce3ce2f9a1483baa
 +F src/vdbeblob.c ae6c3cbc723d0a21d6a5c61c573b45080f795e15a524bc29953bc3114348fa7a
- F src/vdbemem.c 53881aa0a7845922a075b3f375695588618098871a7a4120af4c297b80fa3e64
+ F src/vdbemem.c 0e830c2aab24241eed85bd4c8a5bd8c9b959081316477440bfffb35089ba7d0b
  F src/vdbesort.c cd5130f683706c1a43e165a74187745fb3351cb56052cf9dc91de820634bbde2
- F src/vdbetrace.c 666c6fd9f1b62be6999e072a45b913e3c2c3518bc60dfd4d54fe304130acb724
+ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
  F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
- F src/vtab.c b2178e665a4e73818432cee82dd54ade4d765abfb3d998073572c82cff472e37
 -F src/vtab.c c289aa504f278f23b64cb33c95d284495c5f405bd363b419d31c92c61c14df1f
++F src/vtab.c 86fc8020a6cb7cd01396c01924a07dc5eb07e35f2d3574d3ab239ffb135284cc
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
  F src/wal.c 2be08331d798237ad5d7ae0b252700ffb2b63189cb18d993496d009a93e2f81c
  F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
@@@ -1455,7 -1453,7 +1462,7 @@@ F test/tabfunc01.test d6821e7042e565310
  F test/table.test eb3463b7add9f16a5bb836badf118cf391b809d09fdccd1f79684600d07ec132
  F test/tableapi.test ecbcc29c4ab62c1912c3717c48ea5c5e59f7d64e4a91034e6148bd2b82f177f4
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
- F test/tclsqlite.test 03b70fcd669745fe315c900389c928cdab61ee182ad6c75bd21a54d023f57bcb
 -F test/tclsqlite.test 97cda6e4843e9f3e06c56f656d9b77ee0178fe1ee33fb09a6eeae8f125757ac1
++F test/tclsqlite.test 207d3661a36de1c4a11affc020f6626aed2ac2693c4bfa8ddbb54e3c36ff05d7
  F test/tempdb.test 4cdaa23ddd8acb4d79cbb1b68ccdfd09b0537aaba909ca69a876157c2a2cbd08
  F test/tempdb2.test 353864e96fd3ae2f70773d0ffbf8b1fe48589b02c2ec05013b540879410c3440
  F test/tempfault.test 0c0d349c9a99bf5f374655742577f8712c647900
@@@ -1863,7 -1862,7 +1872,7 @@@ F tool/mkmsvcmin.tcl 6ecab9fe22c2c8de4d
  F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef
  F tool/mkopcodeh.tcl 130b88697da6ec5b89b41844d955d08fb62c2552e889dec8c7bcecb28d8f50bd
  F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
- F tool/mkpragmatab.tcl 720adb9f91c992a2783a6ae98454d61b124c5c8a26b383322fe8a8a0d99a76a8
 -F tool/mkpragmatab.tcl 056338994c2a816076342dc1035294db3980152f514050067659af3ea4526361
++F tool/mkpragmatab.tcl 650e689c71d57580972b894ec98c5803d34c49d2db850473f4287229b3091b71
  F tool/mkshellc.tcl df5d249617f9cc94d5c48eb0401673eb3f31f383ecbc54e8a13ca3dd97e89450
  F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
@@@ -1930,7 -1929,7 +1939,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P d71adc3fd85cfc5902b7146101d030ab2fbe932ed05848a407a7422ddeeb4c43 bf9d70fc2fde06a3f132270a26d4abe321687169066aff26ad9e92757c7f9ee4
- R 69b8fa43accc454cc462f6123d0cbffd
 -P be211a9c59234ef202e772fcaae18be43c44e1e00674f137cad2d903e00bfcab
 -R 292b396dc8ad27f72b460cd6d9853182
++P c8d1f17fde280acd3e98772d947a5b1e698b08d25b23bcd0731ae2d18cfbddcf 8b24c177061c38361588f419eda9b7943b72a0c6b2855b6f39272451b8a1b813
++R a5e83cfff0ecd99be280c76ff7d7a24c
  U drh
- Z 6f252d3e5e8964418a93d64c78ab4e77
 -Z eff1f6baf32edbc9330b75894ca2e4ea
++Z c3acbdaa9ebf3d49766fe9216fcd8c82

diff --cc manifest.uuid
index e9a7e57fbd316f222138eed0770bc41bc1080a54,c4357ca7916d924a882cd1b8c54d84e3b676c6b4..4323d4e3427c311ed51856be817a06757c9e1920
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c8d1f17fde280acd3e98772d947a5b1e698b08d25b23bcd0731ae2d18cfbddcf
 -8b24c177061c38361588f419eda9b7943b72a0c6b2855b6f39272451b8a1b813
++64234c5c9a5709e7c7c1b18bf32f4374692129b353c4698010abfc98bd00bcc4

diff --cc src/alter.c
Simple merge

diff --cc src/analyze.c
Simple merge

diff --cc src/build.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/pragma.h
index aace42174fe06512944daeeabbd05c236a3cfae4,f90de7c77b238c281af0776fcf892c565a14aa1b..7bae226cca8ec287ed96dc1618a30a2859264dbc
--- 1/src/pragma.h
--- 2/src/pragma.h
+++ b/src/pragma.h
@@@ -251,15 -251,15 +258,15 @@@ static const PragmaName aPragmaName[] 
  #if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS)
   {/* zName:     */ "database_list",
    /* ePragTyp:  */ PragTyp_DATABASE_LIST,
 -  /* ePragFlg:  */ PragFlg_NeedSchema|PragFlg_Result0,
 +  /* ePragFlg:  */ PragFlg_NeedSchema|PragFlg_Result0|PragFlg_OneSchema,
-   /* ColNames:  */ 41, 3,
+   /* ColNames:  */ 47, 3,
    /* iArg:      */ 0 },
  #endif
  #if !defined(SQLITE_OMIT_PAGER_PRAGMAS) && !defined(SQLITE_OMIT_DEPRECATED)
   {/* zName:     */ "default_cache_size",
    /* ePragTyp:  */ PragTyp_DEFAULT_CACHE_SIZE,
 -  /* ePragFlg:  */ PragFlg_NeedSchema|PragFlg_Result0|PragFlg_SchemaReq|PragFlg_NoColumns1,
 +  /* ePragFlg:  */ PragFlg_NeedSchema|PragFlg_Result0|PragFlg_SchemaReq|PragFlg_NoColumns1|PragFlg_OneSchema,
-   /* ColNames:  */ 49, 1,
+   /* ColNames:  */ 55, 1,
    /* iArg:      */ 0 },
  #endif
  #if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
@@@ -549,8 -549,8 +556,8 @@@
  #if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS) && defined(SQLITE_DEBUG)
   {/* zName:     */ "stats",
    /* ePragTyp:  */ PragTyp_STATS,
 -  /* ePragFlg:  */ PragFlg_NeedSchema|PragFlg_Result0|PragFlg_SchemaReq,
 +  /* ePragFlg:  */ PragFlg_NeedSchema|PragFlg_Result0|PragFlg_SchemaReq|PragFlg_OneSchema,
-   /* ColNames:  */ 27, 5,
+   /* ColNames:  */ 33, 5,
    /* iArg:      */ 0 },
  #endif
  #if !defined(SQLITE_OMIT_PAGER_PRAGMAS)
@@@ -640,8 -645,8 +652,8 @@@
    /* iArg:      */ 0 },
   {/* zName:     */ "wal_checkpoint",
    /* ePragTyp:  */ PragTyp_WAL_CHECKPOINT,
 -  /* ePragFlg:  */ PragFlg_NeedSchema,
 +  /* ePragFlg:  */ PragFlg_NeedSchema|PragFlg_OneSchema,
-   /* ColNames:  */ 44, 3,
+   /* ColNames:  */ 50, 3,
    /* iArg:      */ 0 },
  #endif
  #if !defined(SQLITE_OMIT_FLAG_PRAGMAS)

diff --cc src/prepare.c
index 2145cd49f5cde91e5f3a3fcf963125840e9e92f5,62dca01b6b98f7264b8d1c8302ceeff9c75855f9..ab047871cb81e40ef98c894598d696bb220cb39d
--- 1/src/prepare.c
--- 2/src/prepare.c
+++ b/src/prepare.c
@@@ -170,13 -134,9 +170,13 @@@ int sqlite3InitCallback(void *pInit, in
        }
      }
      db->init.orphanTrigger = 0;
-     db->init.azInit = argv;
+     db->init.azInit = (const char**)argv;
      pStmt = 0;
 +#ifdef SQLITE_ENABLE_SHARED_SCHEMA
 +    TESTONLY(rcp = ) sqlite3LockAndPrepare(db, argv[4], -1, 0, 0, &pStmt, 0);
 +#else
      TESTONLY(rcp = ) sqlite3Prepare(db, argv[4], -1, 0, 0, &pStmt, 0);
 +#endif
      rc = db->errCode;
      assert( (rc&0xFF)==(rcp&0xFF) );
      db->init.iDb = saved_iDb;

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/tclsqlite.c
Simple merge

diff --cc src/test_tclsh.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vtab.c
Simple merge

diff --cc test/tclsqlite.test
Simple merge

diff --cc tool/mkpragmatab.tcl
index d69f3c3f86e3f11bf33fc347bfacc8ba304b7ce6,530b6c2224fed9d41f4eacaa228267238d518c34..caf45f339e544ee9ed05bcfe165f051241a8581e
--- 1/tool/mkpragmatab.tcl
--- 2/tool/mkpragmatab.tcl
+++ b/tool/mkpragmatab.tcl
@@@ -231,8 -231,14 +231,14 @@@ set pragma_def 
    COLS: cid name type notnull dflt_value pk hidden
    IF:   !defined(SQLITE_OMIT_SCHEMA_PRAGMAS)
  
+   NAME: table_list
+   TYPE: TABLE_LIST
+   FLAG: NeedSchema Result1 SchemaOpt
+   COLS: schema name type ncol wr strict
+   IF:   !defined(SQLITE_OMIT_SCHEMA_PRAGMAS)
+ 
    NAME: stats
 -  FLAG: NeedSchema Result0 SchemaReq
 +  FLAG: NeedSchema Result0 SchemaReq OneSchema
    COLS: tbl idx wdth hght flgs
    IF:   !defined(SQLITE_OMIT_SCHEMA_PRAGMAS) && defined(SQLITE_DEBUG)