Bring the reuse-schema branch up to date with the latest trunk changes.

FossilOrigin-Name: d8ea0cb69d9b47c2d3e1048671623cada18cc997612edf8f617ea48882e2b052

diff --cc Makefile.msc
Simple merge

diff --cc manifest
index 6cf15ce5df50d84c1f8dfa8452b8901906da676d,9f4f6e3da8f1bf70fd38d1afee16dc8344c36c71..11bb6aaf7449362fa0996d013dfe791ce797a6d5
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- 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
 -C Add\svdbevtab.lo\sto\sbuild\sof\slibsqlite3.lib\sin\sMakefile.msc.
 -D 2020-05-18T18:02:37.420
++C Bring\sthe\sreuse-schema\sbranch\sup\sto\sdate\swith\sthe\slatest\strunk\schanges.
++D 2020-05-18T19:11:35.509
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 -F Makefile.in 376f53999defeb32b7ad2626fd58aae8f3694c38ab7ee30c2289e0d0525a9238
 +F Makefile.in 201a181c0a852139bbb7e74a28d3d24d03953b91c372ed24a644b17070836bea
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
- F Makefile.msc 239b702e7594c7999e08226040bdc84358adcd32fa66feb89c9095bb16d2ba5e
 -F Makefile.msc 8d00aeba2609bb498dded5eead2890126321f02e292573bf29bf2d18487d37bd
++F Makefile.msc 5f9b4709c8d5d089a1e7264682c58c7b95a377aa12fdcba9a57e72f021d3d1f8
  F README.md 1514a365ffca3c138e00c5cc839906108a01011a6b082bad19b09781e3aa498a
  F VERSION 980d78a2ce04a1fd0ebefbaabd665f7f9186563820629ee29c6e350e96f19b52
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -488,8 -487,8 +488,8 @@@ F src/dbstat.c 793deaf88a0904f88285d93d
  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 4780623a0c67f9241d4d5360a7d612826cfb22b825d95de9dce959c43c09ff47
+ F src/func.c 2333eb4277f55a5efdc12ef754e7d7ec9105d257b2fd00301d23ce1e8fa67dc0
  F src/global.c 79a988b56b06ce2d08ebefe1d35da9aa25b3851faa47ea5233361c4827185a64
  F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
  F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
@@@ -498,8 -497,8 +498,8 @@@ F src/in-operator.md 10cd8f4bcd225a3251
  F src/insert.c 8e4211d04eb460c0694d486c6ba1c068d468c6f653c3f237869a802ad82854de
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 421310045bd78afefb772294a99e50f37d87ae578786a6169074e6291e30d969
 -F src/main.c 97d962ab1f830540043042e41085c5b85636a60e6ed95002c1a56b64f7eb6a0b
 +F src/main.c 3e88148106fead4d8edfec84a8c3604bd84fb6af4eceb4d20020387c52405d77
- F src/malloc.c 167e91665080a2a6f92d358419e0b7e6440f2bba0b55e764a4f0197c95c8a077
+ F src/malloc.c d0400b0366e1a3a2414ca4534b4a7406df34732835f37a15cb4642eb7df1a363
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -527,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 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 4c76c0f4920c5a8a774540c5624d861fab0097212ee7444c07bbcaae15734999
+ F src/printf.c ebf563cff3122f6a61149964b738b470196d3619df31d6a720d0ff72fcfd7c7b
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  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 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/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 -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
@@@ -617,9 -615,9 +617,9 @@@ F src/vdbemem.c 39b942ecca179f4f30a32b5
  F src/vdbesort.c 2be76d26998ce2b3324cdcc9f6443728e54b6c7677c553ad909c7d7cfab587df
  F src/vdbetrace.c fa3bf238002f0bbbdfb66cc8afb0cea284ff9f148d6439bc1f6f2b4c3b7143f0
  F src/vdbevtab.c ee5b4c902fdda2230f9503ac7b84c6d614c91e8f6f4dc1633e2e8dfef8ffb144
- F src/vtab.c 0119233719474ebefeea02f3bc9c08edcb2e409dbf7ed0820060223be8122aff
 -F src/vtab.c 7b452592ed2ee95dedb1f323d557cebede5a6f3b4558b21a5dca527e6ae9b12c
++F src/vtab.c df7634fbdf42f8dc53f0a95eebf913b11a34bbdb7ae6cd08b8e55119a0ce227d
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c 3dc15756d3c859799e30460e1ec6cd304e660df7f680f5cb1b50537de1e6f678
+ F src/wal.c d0365581aed11a75e176f67cdbdc1bdfe685c5381a052360a00bbf58d3252fa0
  F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
  F src/walker.c 7c429c694abd12413a5c17aec9f47cfe9eba6807e6b0a32df883e8e3a14835ed
  F src/where.c 9546c82056e8cdb27291f98cf1adca5d271240b399bb97b32f77fc2bea6146c9
@@@ -1876,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 507f972e91ffdc8d80a6ce594139ea4c7afad38791a08032637340fbf49842bc dc18d89354cffcb726722c234a0271ab628a71277b22887eea2bf118028193a6
- R 57e1e7abc59cb514ebacd9bd80ece7b1
 -P 69e149f76853d196c8855fedfc98848b60fb116ac36bc08824b1a122469f8ece
 -R 3630bc41d5bae3aeb507521e3969369e
 -U dan
 -Z ad12d06ec98773d9201d7cf643b16e9f
++P 5af4abe98c747ff5c6a84b6cc1f7b69d9b492a807a8fd5234163f3bd9c96c574 f64d054b799c0af8d582fd9aff9bcbfa380ef08026ba5db8c5f89f6f56dfdad9
++R 7d31b115edb713d0c133755445cf86fa
 +U drh
- Z cea9e8d8bd22c0f5ba9d45a4a5dfcc81
++Z 0736ae05b6a2db2e5bf8677583a07ae7

diff --cc manifest.uuid
index 6c5484f8546c1e4d4d79d662cdd71ba90ea699a1,7c14e40f1733c1016dcae3904a507b974722b9f2..1052774565ddbd317d60cb78bb32c51863284081
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5af4abe98c747ff5c6a84b6cc1f7b69d9b492a807a8fd5234163f3bd9c96c574
 -f64d054b799c0af8d582fd9aff9bcbfa380ef08026ba5db8c5f89f6f56dfdad9
++d8ea0cb69d9b47c2d3e1048671623cada18cc997612edf8f617ea48882e2b052

diff --cc src/vtab.c
Simple merge