Merge recent fixes from trunk.

FossilOrigin-Name: 4a343698b4ec3364b0eecb7fa074512ecac8b586aff1f977ca77f215e96e0ce5

diff --cc manifest
index f6c9a71b6944ebbd5c2aeedcb4bc6160852601ef,ecd013448c5833b63a3d20853a10e8bdf48a9399..ce505cdd02e363438ea1bb27870fdd417a42a8ad
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Use\sthe\scanonical\sname,\snot\sthe\sAS\sname,\swhen\sshowing\sthe\sMATERIALIZE\sor\nCO-ROUTINE\slines\sfor\sa\sCTE.
- D 2021-03-20T15:46:01.337
 -C Increase\sthe\sversion\snumber\sto\s3.36.0\sto\sbegin\sthe\snext\sdevelopment\scycle.
 -D 2021-03-22T16:50:39.437
++C Merge\srecent\sfixes\sfrom\strunk.
++D 2021-03-22T18:53:26.486
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -486,7 -486,7 +486,7 @@@ F src/btmutex.c 8acc2f464ee76324bf13310
  F src/btree.c cfd2a37794532d765e235a2550ad2732924a6d06b07a3bc9f6a71750e3b3cca1
  F src/btree.h 096cc53baa58be22b02c896d1cf933c38cfc6d65f9253c1367ece8cc88a24de5
  F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae0
- F src/build.c ef2a6632323b5705febb2b2fe14ab87068fbc8d17a3c70937e110b8a24113306
 -F src/build.c 066c44421bf7b73c6fa47f6fb0c0fcf1357c10552bcf8f3f94c6ebede581cd01
++F src/build.c 06089aaf769ec1e91d1ba607442aa32c22aeb97200d47fe405ceb373adbdf2d7
  F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 2a322b9a3d75771fb4d99e0702851f4f68dda982507a0f798eefb0712969a410
@@@ -503,7 -503,7 +503,7 @@@ F src/hash.c 8d7dda241d0ebdafb6ffdeda31
  F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
  F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c b73e6ca39a1ff5bbdb36fbc1600e922fad8e69e1a34e6eea947e18f1aa8bf838
 -F src/insert.c e36be69e3810902eaf7e171260c885bc9547b1d41616c868f1cc46e6a0a3b7fd
++F src/insert.c f8d462ab6174a2c30476b5a1fc77f4d66ce7d9dd45c994966b9f4445db1131f0
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 8c9c8cd2bd8eecdb06d9b6e89de7e9e65bae45cc8fc33609cc74023a5c296067
  F src/main.c 2a7ece3a67c646e5fe9984ffe0277d6a76f80ce9715bf2faa591d8cb66b9d913
@@@ -542,8 -542,8 +542,8 @@@ F src/printf.c 85d3413fa526404f053a2a13
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c dd47248c2c914feb0d4428c27d782e2723971d32cfa5536f49306d080df4d45a
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 -F src/select.c 734cf12e42f81f2fe461e41214e6552375e55b62a802784a4f0066ac592e7f4a
 -F src/shell.c.in aa28256887d049badaf93aa30ab5c76a2ec88143a674d685c0e739056702e5c3
 +F src/select.c fe0a11d7cf2eddd58cf6fc5f65a5faac1eb430102a3f00092673a499bfd4a50e
- F src/shell.c.in 6592c2b1b752e5988c27112370fdf6edf9c5d36959f5134291202930cd967a4d
++F src/shell.c.in dcce260883836c9b58847505fbccce8d5546af925046f7dacd9443e922ece036
  F src/sqlite.h.in 3426a080ea1f222a73e3bd91e7eacbd30570a0117c03d42c6dde606f33e5e318
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e
@@@ -1910,7 -1910,7 +1910,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 50fbd532602d2c316813046ed6be8be2991c281eb5f295c4c28520a0de73862c
- R 8aabd5e1a73e25702742b13fe62bc444
 -P 6bb2134027a12801de8e0c73482d94682f902024800a7e426614f65a2fe4f64c
 -R 1d863aeb92c2f16425031205fec42126
++P 1b83e232c490fe6e9f999d30399faebfac6094bf940dc21dc459ed2c97657cb2 5cee689d647087a5e796da2acb247a4f469a8b39b54f59bb4ad2386647cef1bd
++R 48f6135c13bc2817f3ef8d214e2b8cca
  U drh
- Z 0b6f36b63a67910ac9a53d6251caaa0a
 -Z 1db4f5cf7263d4a62e922b874ab820d2
++Z b8946e71be43a9c5e6dc3a673c862a7b

diff --cc manifest.uuid
index f6f7c2d78a0902b38ad0c8c26fb2f1d552578461,18cb1bbc01ac6e951b72ad749765bfbf4d30f9d1..c8c589abe1b20e151e2d786ed81262b303947acf
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1b83e232c490fe6e9f999d30399faebfac6094bf940dc21dc459ed2c97657cb2
 -5cee689d647087a5e796da2acb247a4f469a8b39b54f59bb4ad2386647cef1bd
++4a343698b4ec3364b0eecb7fa074512ecac8b586aff1f977ca77f215e96e0ce5

diff --cc src/build.c
Simple merge

diff --cc src/insert.c
Simple merge

diff --cc src/shell.c.in
Simple merge