Merge changes from trunk.

FossilOrigin-Name: 7a90571e0a0e43017cf5b9636ff111e0d0f7f9e9a4678d39b0e4f9c176ae232e

diff --cc manifest
index ad6ff01d05484a37dbe18733908c322d94df3efc,b3cbdb5100dd51adbd096a35e46808ff856b7e62..481290ce2b60c367bd3a754522909e307652ffe4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Remove\sunnecessarily\scomplexity\sfrom\ssqlite3WithReleaseByParse().\s\sImproved\nTreeView\soutput\sfor\sthe\senhanced\sCTE\sstructures.\s\sThis\scode\sstill\sdoes\snot\nwork\s100%.\s\sI'm\ssaving\smy\splace\sin\sorder\sto\s(maybe)\scome\sback\sto\sit\slater.
- D 2021-02-16T19:29:44.683
 -C Fix\sanother\sproblem\shandling\scorrupt\sdatabase\sfiles\sin\sthe\sALTER\sTABLE\sDROP\sCOLUMN\scode.
 -D 2021-02-19T18:39:32.279
++C Merge\schanges\sfrom\strunk.
++D 2021-02-20T12:47:54.421
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -485,7 -485,7 +485,7 @@@ F src/btmutex.c 8acc2f464ee76324bf13310
  F src/btree.c 694020ad8a3af3d79b09f74c8f1421272a419cdea42a13401e3b0f7dea6e9c3e
  F src/btree.h 285f8377aa1353185a32bf455faafa9ff9a0d40d074d60509534d14990c7829e
  F src/btreeInt.h 7614cae30f95b6aed0c7cac7718276a55cfe2c77058cbfd8bef5b75329757331
- F src/build.c 224b8d5d6f206903dbcad3b365ce2c33b9e36456689be7ca593655cd3a649189
 -F src/build.c 3e1e1df6807c91c17b0e0cdf24d0e85176d7e006d9783ab3eb1afb154aa26822
++F src/build.c 6bb7341559433152ac5bc082209cbb1f6d62d8d369ca2a1c10387c5c9e8450d5
  F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 2a322b9a3d75771fb4d99e0702851f4f68dda982507a0f798eefb0712969a410
@@@ -530,23 -530,23 +530,23 @@@ F src/os_win.c 77d39873836f1831a9b0b918
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
  F src/pager.c c49952ac5e9cc536778eff528091d79d38b3e45cbeeed4695dc05e207dc6547d
  F src/pager.h 4bf9b3213a4b2bebbced5eaa8b219cf25d4a82f385d093cd64b7e93e5285f66f
- F src/parse.y 7bec75e74a457d1569b093367924c897776375167b66b40c7464e8f63823fa21
 -F src/parse.y cdc4e5efaf1618d82f6b241a30f1a586188bf37e9c55f967258ed15fe24c51a2
++F src/parse.y a8102583778a6aedb602042463d0deb7811c913845561d74de9a9da400f79504
  F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 6596e10baf3d8f84cc1585d226cf1ab26564a5f5caf85a15757a281ff977d51a
  F src/pragma.c 6daaaecc26a4b09481d21722525b079ce756751a43a79cc1d8f122d686806193
  F src/pragma.h 8dc78ab7e9ec6ce3ded8332810a2066f1ef6267e2e03cd7356ee00276125c6cf
- F src/prepare.c e8e056d7e34e5b1092a0f0d4f537278175c806412f8fa605b5f50a40ca0915d3
 -F src/prepare.c 7a534d100c556f45f10aee131f2e4244cb52547b7cf17e1c393f55d8abb62e97
++F src/prepare.c f634a9e799a6b1c136d8ee12479cffa22862bfb807d307b1db406aa0cdb042a5
  F src/printf.c 30e92b638fac71dcd85cdea1d12ecfae354c9adee2c71e8e1ae4727cde7c91ed
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
- F src/resolve.c 89e4faf6171e179edf279905e8e45c4f9dd108777dc60716396729fbd7cb045e
+ F src/resolve.c 52f81603cc40f78449f5b6aed96dbea9484b194771ecb1937e8c0f6547c186a0
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 847bdf40d4b3b04f3316b3ead543ef49596f4f53e48f810c60ce9649748b2774
- F src/shell.c.in 9ebc74e4f05cfbd0f4a36060fdaeff1da4e9af4458358722bc08c5a1ab9a0879
 -F src/select.c 371a5c95d47d4e969337548ed9bd344788f15518a1c75921507355bd93815205
++F src/select.c 1078af8a2e416e83a5f7d05adbee974bce32d1e17f47acd592f18d542a14fa29
+ F src/shell.c.in 844417f84df1f6c4fce1c815629a888cfdcf219e86513e9c332bbcc38832f477
  F src/sqlite.h.in 8855a19f37ade8dad189a9e48233a2ebe1b46faf469c7eb0906a654e252dcc57
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e
- F src/sqliteInt.h d0f3ca58ec5cf148210b186d9eddbb32e847cc845b887506a759d9c255cf0319
 -F src/sqliteInt.h 4bd449478df0444ccb9f6a8e6f210b2ceacdd59562f52630edb0bb2d8cc25094
++F src/sqliteInt.h 652ccfddec0d3df91439b09fda7a9c32a0af07e365f4a1377b5caff03888c2b1
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -606,8 -606,8 +606,8 @@@ F src/test_window.c cdae419fdcea5bad6dc
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
  F src/tokenize.c c64c49d7c2ec4490c2fef1f24350167ba16b03b0c6cee58ad1a1d70a4325d4e9
 -F src/treeview.c 4b92992176fb2caefbe06ba5bd06e0e0ebcde3d5564758da672631f17aa51cda
 +F src/treeview.c 734a65babc2a0bb725a5af33cf3e677f7a8b20ad5be6dc04e07c2ff6081c16e6
- F src/trigger.c 983c7c8464c46840dac1ffe0461a6c447ac12c965746975c108eb5f4283e8801
+ F src/trigger.c 861c3ec2c5b0fc830bdf82470454a9324fad70cbaa96d2e208fb54577c9e8d28
  F src/update.c 0f5a61f0787199983530a33f6fffe4f52742f35fcdf6ccfad1078b1a8bc17723
  F src/upsert.c df8f1727d62b5987c4fd302cd4d7c0c84ae57cd65683c5a34a740dfe24039235
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
@@@ -1900,7 -1904,7 +1904,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 bf0fd9b23a77a8fc1be5f8f8f9f7dce62b924d2f4eecaf13f0b21cc58bfd3a61
- R e3228d2a0a1955d5b3e8f76b5179bb19
 -P 05dbea9b26bdcb096194dc531816333f3784eca50b133fe3efede6ab0d233472
 -R 654376f36a79c8c3f0a8b98f1eb136d6
 -U dan
 -Z 6b0bcca992d79748743aedfd1336dec2
++P 30bb18b45013bf2ac214863c97f64544511cae62029b9762c97cbb69ca658887 9edf2ddc4799c8830c4b7b91d7aacee50029a4b9db329fd4c5674fbedea33034
++R f20aa0dd913bdc4d647b2a24ee109141
 +U drh
- Z b496c3d5115f8ebebdee583ef890099a
++Z 69e153bc572b9edf99468fd37ca7f36e

diff --cc manifest.uuid
index b01838fa6f3845adc38acddc52c2938d0202efc2,735950980f2db16324d8d133e4a44a845c02e075..db7123117ec0b3e90a8a3eda615a78731d39c079
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 30bb18b45013bf2ac214863c97f64544511cae62029b9762c97cbb69ca658887
 -9edf2ddc4799c8830c4b7b91d7aacee50029a4b9db329fd4c5674fbedea33034
++7a90571e0a0e43017cf5b9636ff111e0d0f7f9e9a4678d39b0e4f9c176ae232e

diff --cc src/build.c
Simple merge

diff --cc src/parse.y
Simple merge

diff --cc src/prepare.c
Simple merge

diff --cc src/select.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge