Merge trunk enhancements in the reuse-schema branch.

(Actual date of this check-in is 2020-05-18.)

FossilOrigin-Name: 5af4abe98c747ff5c6a84b6cc1f7b69d9b492a807a8fd5234163f3bd9c96c574

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 433b08b996769cc8f2271d9c9e072bfd7cfeb782,ab646e73ecd93b023e1ae96a065cdc87e334e5ef..6cf15ce5df50d84c1f8dfa8452b8901906da676d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Merge\strunk\schange\s[895bd20b29]\sinto\sthis\sbranch.
- D 2020-03-05T19:00:00.000
 -C The\sOP_RealAffinity\sopcode\sis\snot\snecessary\safter\sreading\svalues\sfrom\na\svirtual\stable\s(such\sas\srtree).\s\sIt\sis\sharmless,\sbut\sit\sdoes\suse\sCPU\ncycles.\s\sMight\sas\swell\sleave\sit\soff.
 -D 2020-05-16T18:01:02.987
++C Merge\strunk\senhancements\sin\sthe\sreuse-schema\sbranch.\n(Actual\sdate\sof\sthis\scheck-in\sis\s2020-05-18.)
++D 2020-05-16T19:00:00.000
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in e97846dfaeb3851107b4dcbffbfc1245d54ff953cf08cc27ab85f1044d057bb7
 -F Makefile.in 376f53999defeb32b7ad2626fd58aae8f3694c38ab7ee30c2289e0d0525a9238
++F Makefile.in 201a181c0a852139bbb7e74a28d3d24d03953b91c372ed24a644b17070836bea
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
- F Makefile.msc a5fc3fada762671dbeb34d1995448c06afb1ec4d287e4bb72c6889e8f1291935
 -F Makefile.msc 14bbe230f81498ed1d5a4df79317c9abdbd2f950cb8030527acccf4e2eddfd34
++F Makefile.msc 239b702e7594c7999e08226040bdc84358adcd32fa66feb89c9095bb16d2ba5e
  F README.md 1514a365ffca3c138e00c5cc839906108a01011a6b082bad19b09781e3aa498a
  F VERSION 980d78a2ce04a1fd0ebefbaabd665f7f9186563820629ee29c6e350e96f19b52
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -38,9 -38,8 +38,9 @@@ F configure 4bbb5f13998f2faf929b9ae708a
  F configure.ac 798a24cee2879325ca5b688a618199eb32cc77ed8136edbaa43d9137b470d54e
  F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
  F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
- F doc/lemon.html 24956ab2995e55fe171e55bdd04f22b553957dc8bb43501dbb9311e30187e0d3
+ F doc/lemon.html 857495c0ce060a4e2f2ad7111135ad7e28041a32c10612279ab398eddf678f58
  F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
 +F doc/shared_schema.md 759fc374709fccf4e5d2d0cbd05f8fedd38fb022bdd8a6c5b5f492684c7023b9
  F doc/trusted-schema.md 33625008620e879c7bcfbbfa079587612c434fa094d338b08242288d358c3e8a
  F doc/vfs-shm.txt e101f27ea02a8387ce46a05be2b1a902a021d37a
  F ext/README.md fd5f78013b0a2bc6f0067afb19e6ad040e89a10179b4f6f03eee58fac5f169bd
@@@ -454,7 -455,7 +456,7 @@@ F ext/userauth/userauth.c 7f00cded7dcaa
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 4f739b347cce517de440e0c22e6fdd10f9290b716efa6005ae7cfacbbd5f1a77
 -F main.mk addd0a300e90ad090dc4a934df8a6f1b6c52c057a1aebb93682aed29fb68a345
++F main.mk 13814e3d9720918964eb7de6273accf601f53ff98d3ee05f37784f69b6d4b66a
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -466,38 -467,38 +468,38 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
- F src/alter.c 5584426b5622b10d2c4cd6695585fcdc4216c0bd0e33ff9958106096ab770fb0
- F src/analyze.c caa9cc97a066a9f0cac443d67676cf4883afb89153a4fdc9ccd61a3a8ae8ef9b
- F src/attach.c c4e5653f5a261b94dec98fd7a0c88d35705cd0838170be76edb743f150cabb63
 -F src/alter.c 826bc4561456094cf758f095776026f25892a2bb3a7cd86742323267dc9bdb5f
 -F src/analyze.c 953a6c43870ccaf080597244e1eeb4dc2ff6cb84f9501b24e46323de36970b61
 -F src/attach.c ff2daea0fe62080192e3f262670e4f61f5a86c1e7bea9cec34e960fe79852aa1
++F src/alter.c e1198116d98c2dd7ca252a54dd6df33d32dd2c74af825b44c40c732fd58c3ffb
++F src/analyze.c b2b878f8467d7c545db8d838d00ae8ac2069cc535fd025b74077d8a439f5c14a
++F src/attach.c 22ddf11d73e1eecf547304e4babd44a322bc1db79c7b0aeb9e53f58a4ae7f8a7
  F src/auth.c a3d5bfdba83d25abed1013a8c7a5f204e2e29b0c25242a56bc02bb0c07bf1e06
- F src/backup.c 5e617c087f1c2d6005c2ec694ce80d6e16bc68d906e1b1c556d7c7c2228b636b
+ F src/backup.c b1c90cd4110248c8e1273ff4578d3a84c0c34725e1b96dacd4a6294a908702de
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c 4dfab5862184da86103795ee2a31a22d2bbf9d8cf183bd3e05f3e32267c0855f
- F src/btree.h 6111552f19ed7a40f029cf4b33badc6fef9880314fffd80a945f0b7f43ab7471
- F src/btreeInt.h dee1a1d0c621524e006bb260bd6b66d5d1867da6fe38cba9ad7b6a9bb9c0c175
- F src/build.c 9edbf33eba02233a9040d43786dce0980f2a4a827b8dffd4b332461f19f6c8ab
+ F src/btree.c f14e415fcfd0b52b4e4ebd193ba5fadac5e8252c30f023389af682813af44025
+ F src/btree.h 989ef3c33413549e3e148f3dcb46c030f317dac130dc86809ba6b9aa4b16c72a
+ F src/btreeInt.h 5c8b8749805787313ecf49eb5be3ced1e94bbf8ef54bb01470ce6bd0d5185c67
 -F src/build.c 520d6d125288b7da745f8299840015f66c1d1b896a9308e24d7fde6fa5fafc9b
 -F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
++F src/build.c 838e367617c20403fc21546fb1d9d9f8ba45d74427dbbc987df46af9f01704a7
 +F src/callback.c d8cdf5d697a31cf54a2b64bce9001fe24f3522a566f44c9fe1eb3a0c7e291c56
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c d468aa1801f33436522cfb7c8c6c12575cb69ddf3622746beaa09faf0f617005
- F src/date.c 6c408fdd2e9ddf6e8431aba76315a2d061bea2cec8fbb75e25d7c1ba08274712
 -F src/ctime.c e98518d2d3d4029a13c805e07313fb60c877be56db76e90dd5f3af73085d0ce6
++F src/ctime.c f5eaef0a5985fab6fc21e8b00aeaea1ca862a09c1ea5e505b0ad1da157eec247
+ F src/date.c b29b349d277e3d579dcc295b24c0a2caed83fd8f090a9f7cbe6070c0fd662384
  F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
- F src/dbstat.c 0f55297469d4244ab7df395849e1af98eb5e95816af7c661e7d2d8402dea23da
- F src/delete.c 11000121c4281c0bce4e41db29addfaea0038eaa127ece02557c9207bc3e541d
- F src/expr.c 4b25db7f9472b3532560242193bc4eefaefc7720dc4f2d7ec9a89ada410c6ea2
+ F src/dbstat.c 793deaf88a0904f88285d93d6713c636d55ede0ffd9f08d10f4ea825531d367f
+ F src/delete.c 88047c8e59878c920fce14582bc1dde4d81157d1ca5ffdf36c2907e6d41996c4
+ F src/expr.c 8eed44d9de8a3b0fe1c9809bb75a02b65488774c8ba8685512d8f63adade18e5
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 -F src/fkey.c 4b575423b0a5d4898b1a7868ce985cf1a8ad91c741c9abbb108ff02536d20f41
 +F src/fkey.c 784662bc65fd0770221bc91c58c45a785849b49ecb39fdb163fb5c65d067d377
- F src/func.c 108577cebe8a50c86d849a93b99493a54e348dd0b846f00d13b52ca973d5baf4
+ F src/func.c 4780623a0c67f9241d4d5360a7d612826cfb22b825d95de9dce959c43c09ff47
  F src/global.c 79a988b56b06ce2d08ebefe1d35da9aa25b3851faa47ea5233361c4827185a64
  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 9b487eb4b756a2bab16fa5ba19d207375551f7d0b8da3f4dff769f3035dc6bab
+ F src/insert.c 8e4211d04eb460c0694d486c6ba1c068d468c6f653c3f237869a802ad82854de
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
- F src/loadext.c b179df50e6e8bb0c36c149e95d958d49bd8c6c7469e59c01b53d164360bc6c32
- F src/main.c c12812e0255e936a745cbe7fbeca8903ce08388cd256cbe95a0131d453e9ba0f
- F src/malloc.c eaa4dc9602ce28b077f7de2eb275db2be270c5cc56d7fec5466301bd9b80e2f5
+ F src/loadext.c 421310045bd78afefb772294a99e50f37d87ae578786a6169074e6291e30d969
 -F src/main.c 97d962ab1f830540043042e41085c5b85636a60e6ed95002c1a56b64f7eb6a0b
++F src/main.c 3e88148106fead4d8edfec84a8c3604bd84fb6af4eceb4d20020387c52405d77
+ F src/malloc.c 167e91665080a2a6f92d358419e0b7e6440f2bba0b55e764a4f0197c95c8a077
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -525,23 -526,23 +527,23 @@@ F src/parse.y c8eff38606f443d5ba245263f
  F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 6596e10baf3d8f84cc1585d226cf1ab26564a5f5caf85a15757a281ff977d51a
- F src/pragma.c 059139100831d7fafb8070a0edf7e025ace31dbce1fb1455ffc57b6ff7d8cc93
- F src/pragma.h 4aaad4b1d9ff8b99cf7af658d5215f5004d06174f7d06bac60a2c61820d2786b
 -F src/pragma.c 1b0db48177e52b256c003b8dc6ac708b1079a82cded944a23820574586a4731f
 -F src/pragma.h 8168e588536bffd95319451f34e9a754dc37d205ebe433031a7813c5b286beae
 -F src/prepare.c 8d4d6c8aa6afefc48027c54b41cdf134b4d6bc2fc4badbe483ad7fd9e1728a28
++F src/pragma.c 4937f87d57292a80b61d7a858d8d26eb9a33e8cbd43389a62530cb34dd0adac8
++F src/pragma.h 29c562664ae96b51e5687f66af3c6e7f3481ff42f7c0fe1d05708da69cd50789
 +F src/prepare.c 45824c5f6dbacb9cb2c966a1d6eebdd94170da9b8700a265abd6a5e49cbd73dd
- F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
+ F src/printf.c 4c76c0f4920c5a8a774540c5624d861fab0097212ee7444c07bbcaae15734999
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
- F src/resolve.c 38e3a5636f5bdc92e3683e4cafbba6418c0aa15e0d89ca5b28bd0b621dbb80bf
- F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
- F src/select.c c94eec317c8ba929bc228392eb3cac8124f2d0fbe3fc1bddecb44dfc7057bc78
- F src/shell.c.in 42c8c25bd8aa03827cf042d0263a8f9a532e35548857d39246bdcdbf125ccc0c
- F src/sqlite.h.in 4d7bb5bebb0a925f587fd3f6d45a4742baab40195d04a7014b2e88a05571cd1d
+ F src/resolve.c d36a2b1639e1c33d7b508abfd3452a63e7fd81737f6f3940bfef085fca6f21f4
+ F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
+ F src/select.c ee4b02ad8047c35891b7a612091beec21ae7a0155290dcbefb0824aed20c46f3
 -F src/shell.c.in cf2d24f54412c06e5fb34af7fabc748651125e1dceac29b740e91f06d23447b6
 -F src/sqlite.h.in 74342b41e9d68ff9e56b192009046f8dd0aa2bd76ce1a588f330de614ba61de7
++F src/shell.c.in a1be0ab48832b0863a92969bbf3575eb04efd1c644719d713507ae4367ea6f9d
++F src/sqlite.h.in b88058cf1d02cbb51ab7d15ac89461896a6cb638b6180dee4b4f20311cfbbd03
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h 9c5269260409eb3275324ccace6a13a96f4ad330c708415f70ca6097901ff4ee
- F src/sqliteInt.h f45995114ccf7172fdca508babcc5eca038a0955923079dafd6801422cce6846
+ F src/sqlite3ext.h 2d1af80082edffd71c6f96f70ad1ce6a4fb46615ad10291fc77fe0dea9ff0197
 -F src/sqliteInt.h 8878a88c18a013d1843638001d7fc56a8f99740f151fc7597b1641b61accf58c
++F src/sqliteInt.h 30fc243428f667a10b9d830942d890eb6fa8a87941926138cadea6d0f63c44d0
  F src/sqliteLimit.h 95cb8479ca459496d9c1c6a9f76b38aee12203a56ce1092fe13e50ae2454c032
 -F src/status.c 9ff2210207c6c3b4d9631a8241a7d45ab1b26a0e9c84cb07a9b5ce2de9a3b278
 +F src/status.c f6e2b6c37873620ce2cb597f5606a1c9adca4c0db1ff3a08a37231e920d21985
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
- F src/tclsqlite.c e2326854624e356ca2edf2c95309f62d78c53eeb9143824be319112d0baa9c44
 -F src/tclsqlite.c 986b6391f02cd9b53c1d688be55899f6ffddeb8e8014cd83c1b73ff912579a71
++F src/tclsqlite.c f4dd32d001c2be33371dca87e30117352f02dad59a2e5428c97f08703360a169
  F src/test1.c 5e8b8cc54e8c88906ea8a084387aa79bad245e539f4cee73149e5c0527e1db16
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
@@@ -597,29 -597,30 +599,30 @@@ F src/test_windirent.h 90dfbe95442c9762
  F src/test_window.c cdae419fdcea5bad6dcd9368c685abdad6deb59e9fc8b84b153de513d394ba3f
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
- F src/tokenize.c 1f2627ae84b327c8a55425d0e53568e56a86a304ea4c91e016a58283549e8367
- F src/treeview.c 438c1000587b33faba35e87596bebcf7f40638d98f33781cdd9e04711b18b09c
- F src/trigger.c 8256290482385fad62daaf9b8f0b1e2c0a74931d34a92d0ccd5c675e16b37c68
- F src/update.c 3eb778c42155d944377a4ee5e440b04520f07094804ed6ce63d2528f619614d9
 -F src/tokenize.c eee7bae3ec0bc4abee951554bf46a8ba567c0f7752ac90c820ed8afff4c612dc
++F src/tokenize.c 194677eb6d46dff9a4d6d615af3e43405ab893c340f3807ba6da326d50948a1b
+ F src/treeview.c 82c6391a3ba76215d4185fd4719a56ec4caf186a40c8a7b6e6ba4ae4467c2742
 -F src/trigger.c 4ada1037cc99777f647a882cdacbd1a4deb6567b69daf02946286401b88cdc04
++F src/trigger.c fe34ac585410bf1cd449db2eebea6b343601c7af590b8e666b320a102ced2f12
+ F src/update.c 3199098455830fc2d8c8fc4ae3ec2ea513eef64339ae9a7048db62b21169bc7a
  F src/upsert.c 2920de71b20f04fe25eb00b655d086f0ba60ea133c59d7fa3325c49838818e78
  F src/utf.c 95fb6e03a5ca679045c5adccd05380f0addccabef5911abddcb06af069500ab7
- F src/util.c a285c1e026907b69fa2592bd05047a565a1d8a1aef2b73c924b6a8ffe772871a
- F src/vacuum.c e924c7ba95b3261bf3950f0f125733af9687700f358cdb183fe345a9acd62014
- F src/vdbe.c 988413f30f6f97f0ebecc663cc605a16c78aadb8af65952995057d95856c0727
- F src/vdbe.h 567b3202652d1c3ba5793d954e80820c7c97fe5d11c091b83b9cbcd5d89d6361
- F src/vdbeInt.h a17146053a1aa438474012998fe07e314f3df274a61491ad838ad85d848ac051
- F src/vdbeapi.c 1252d80c548711e47a6d84dae88ed4e95d3fbb4e7bd0eaa1347299af7efddf02
- F src/vdbeaux.c 0932ff0be867bdf2a7cb75d0b3b1e4cd1f5eaab70926c440ba9e1f9637a7c99a
+ F src/util.c 3b6cedf7a0c69bd6e1acce832873952d416212d6293b18d03064e07d7a9b5118
 -F src/vacuum.c de9780b89fa4ee74c3534f60b94820e3179aca759ffc1338ee53cb4ea7693dd3
 -F src/vdbe.c e3dba0dee25bc92e871c13cac655260912b3be4abcc85b439259c9934b208da3
 -F src/vdbe.h 07b8c636a87df8b6e58f29d6badd7f10d5844353deff1d7c88ed1c2bfe3bbd35
++F src/vacuum.c 593bdeaa1381b9f3030691ef5a5143d738d509311bca54e1201998ca2b51f633
++F src/vdbe.c 56860bb96bdf2162642e54ca4fc4147369c4a439018858759c3d336659ad1c1b
++F src/vdbe.h 1c7eaf26b674d9c1a8030b5ad27531e4b99df472a1fba78de43bcd0e812fb763
+ F src/vdbeInt.h 571413068b5ac07e2ed8ca7a02fa529622fd5455ae6981498376e5e492d2e5ef
+ F src/vdbeapi.c e467b75a710ea099f8d2d022abf601d2ccd05e28f63b44b12d93000b6a75f4a8
 -F src/vdbeaux.c 80626786d21296d9e7936186850343afe5fc6368ad9724a172e151788425a063
 -F src/vdbeblob.c 253ed82894924c362a7fa3079551d3554cd1cdace39aa833da77d3bc67e7c1b1
++F src/vdbeaux.c 79846956661ec4b4b36e41c9d072f1294c0865ab429be48aa1e5f079ae5ee754
 +F src/vdbeblob.c 40028e015fe557a945c99edb6cbf844ea96d853c3e8ac4eb5c1e49bff59f154e
  F src/vdbemem.c 39b942ecca179f4f30a32b54579a85d74ccaefa5af2a0ad2700abe5ef0768b22
  F src/vdbesort.c 2be76d26998ce2b3324cdcc9f6443728e54b6c7677c553ad909c7d7cfab587df
  F src/vdbetrace.c fa3bf238002f0bbbdfb66cc8afb0cea284ff9f148d6439bc1f6f2b4c3b7143f0
 -F src/vtab.c 7b704a90515a239c6cdba6a66b1bb3a385e62326cceb5ecb05ec7a091d6b8515
+ F src/vdbevtab.c ee5b4c902fdda2230f9503ac7b84c6d614c91e8f6f4dc1633e2e8dfef8ffb144
 +F src/vtab.c 0119233719474ebefeea02f3bc9c08edcb2e409dbf7ed0820060223be8122aff
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c 697424314e40d99f93f548c7bfa526c10e87f4bdf64d5a76a96b999dd7133ebc
- F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
- F src/walker.c a137468bf36c92e64d2275caa80c83902e3a0fc59273591b96c6416d3253d05d
- F src/where.c 3b8c9bd013eb0736e16f60bdc109e83337ef99513a3aff5f16ddac036e6c277e
+ F src/wal.c 3dc15756d3c859799e30460e1ec6cd304e660df7f680f5cb1b50537de1e6f678
+ F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
+ F src/walker.c 7c429c694abd12413a5c17aec9f47cfe9eba6807e6b0a32df883e8e3a14835ed
+ F src/where.c 9546c82056e8cdb27291f98cf1adca5d271240b399bb97b32f77fc2bea6146c9
  F src/whereInt.h 6b874aa15f94e43a2cec1080be64d955b04deeafeac90ffb5d6975c0d511be3c
  F src/wherecode.c 7b939de85d65cc4b4bfa197513136b9e0ae03167e3b82842ca5a0ba1055ba65d
  F src/whereexpr.c 264d58971eaf8256eb5b0917bcd7fc7a1f1109fdda183a8382308a1b18a2dce7
@@@ -1803,7 -1799,7 +1809,7 @@@ F tool/mkmsvcmin.tcl 6ecab9fe22c2c8de4d
  F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
  F tool/mkopcodeh.tcl 352a4319c0ad869eb26442bf7c3b015aa15594c21f1cce5a6420dbe999367c21
  F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
- F tool/mkpragmatab.tcl b5136888e4297f7e9a16865eb88c08c1cd91e37bb5df9f2f50cc31cc13b5787f
 -F tool/mkpragmatab.tcl d348a4bf71ac068bddf89326562071cbbd962273d88f9b5e5d622f3e73b78bdf
++F tool/mkpragmatab.tcl 44bcfb4aaff0a9a4f44b3ae71e2b3b2bb0cfb41f918d63f57a302da00aadb128
  F tool/mkshellc.tcl 70a9978e363b0f3280ca9ce1c46d72563ff479c1930a12a7375e3881b7325712
  F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
@@@ -1870,7 -1866,7 +1876,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 9d068e1ef04e84c025d2f696919dd5d1fe385abacbbd3ea31da58c74ae2812bf 895bd20b29e223496e1585483c6ce3335ae9050f2e5de4d6b69d0e40df396862
- R 0980ec7caa2895676811d42db83a3597
- U dan
- Z 0829c39fe4da338cfec0073347e36a2f
 -P 0d69f76f0865f9626078bee087a22fb826407279e78cf9d5382e1c985c9f64a9
 -R 038aaeab4f18be62314e9be676a83d68
++P 507f972e91ffdc8d80a6ce594139ea4c7afad38791a08032637340fbf49842bc dc18d89354cffcb726722c234a0271ab628a71277b22887eea2bf118028193a6
++R 57e1e7abc59cb514ebacd9bd80ece7b1
+ U drh
 -Z f53eca45dfc23be88eb50db1df821f15
++Z cea9e8d8bd22c0f5ba9d45a4a5dfcc81

diff --cc manifest.uuid
index ab43f0deb9a5bc834d9348a2aaccccc9642426de,c658518beb6ff7e26c2c68a233ed552dd8c77a56..6c5484f8546c1e4d4d79d662cdd71ba90ea699a1
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 507f972e91ffdc8d80a6ce594139ea4c7afad38791a08032637340fbf49842bc
 -dc18d89354cffcb726722c234a0271ab628a71277b22887eea2bf118028193a6
++5af4abe98c747ff5c6a84b6cc1f7b69d9b492a807a8fd5234163f3bd9c96c574

diff --cc src/alter.c
Simple merge

diff --cc src/analyze.c
Simple merge

diff --cc src/attach.c
Simple merge

diff --cc src/build.c
index ec360c870311ba05c275e5674bfe66f23bd65630,8b0977a48d946f19c6ffe6965b9124b55d79c96e..3bae2304c5d11b104a861d32ce853ea32f30d3a4
--- 1/src/build.c
--- 2/src/build.c
+++ b/src/build.c
@@@ -348,21 -315,10 +348,21 @@@ Table *sqlite3FindTable(sqlite3 *db, co
    while(1){
      for(i=OMIT_TEMPDB; i<db->nDb; i++){
        int j = (i<2) ? i^1 : i;   /* Search TEMP before MAIN */
-       if( zDatabase==0 || sqlite3StrICmp(zDatabase, db->aDb[j].zDbSName)==0 ){
+       if( zDatabase==0 || sqlite3DbIsNamed(db, j, zDatabase) ){
 +        int bUnload = 0;
          assert( sqlite3SchemaMutexHeld(db, j, 0) );
 +        if( IsSharedSchema(db) ){
 +          Parse *pParse = db->pParse;
 +          if( pParse && pParse->nErr==0 ){
 +            pParse->rc = sqlite3SchemaLoad(db, j, &bUnload, &pParse->zErrMsg);
 +            if( pParse->rc ) pParse->nErr++;
 +          }
 +        }
          p = sqlite3HashFind(&db->aDb[j].pSchema->tblHash, zName);
          if( p ) return p;
 +        if( bUnload ){
 +          sqlite3SchemaRelease(db, j);
 +        }
        }
      }
      /* Not found.  If the name we were looking for was temp.sqlite_master

diff --cc src/ctime.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/pragma.h
Simple merge

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
index e2ec8beb40be99cdbf04b88b74378a2e1072be77,d80c25251cf5447406dfbd59755ea6566a8c383a..48694fa3de185bd06fd175b854580e8fbf46f2d2
--- 1/src/tclsqlite.c
--- 2/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@@ -3799,16 -3797,10 +3800,20 @@@ static int SQLITE_TCLAPI DbMain
        }else{
          flags &= ~SQLITE_OPEN_URI;
        }
 +#ifdef SQLITE_ENABLE_SHARED_SCHEMA
 +    }else if( strcmp(zArg, "-shared-schema")==0 ){
 +      int b;
 +      if( Tcl_GetBooleanFromObj(interp, objv[i], &b) ) return TCL_ERROR;
 +      if( b ){
 +        flags |= SQLITE_OPEN_SHARED_SCHEMA;
 +      }else{
 +        flags &= ~SQLITE_OPEN_SHARED_SCHEMA;
 +      }
 +#endif /* ifdef SQLITE_ENABLE_SHARED_SCHEMA */
+     }else if( strcmp(zArg, "-translatefilename")==0 ){
+       if( Tcl_GetBooleanFromObj(interp, objv[i], &bTranslateFileName) ){
+         return TCL_ERROR;
+       }
      }else{
        Tcl_AppendResult(interp, "unknown option: ", zArg, (char*)0);
        return TCL_ERROR;

diff --cc src/tokenize.c
Simple merge

diff --cc src/trigger.c
Simple merge

diff --cc src/vacuum.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbe.h
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc tool/mkpragmatab.tcl
Simple merge