Merge minor fixes from trunk.

FossilOrigin-Name: d876b287e1d1fdc1db083fb9786889fb82117ec77defdaa078858e1092068166

diff --cc manifest
index c87d81f18df883a253b2f063a1e0924063e8b54c,9d684a6c24ad5547b6e2f96806538ae5f95026ec..dd8b5230aba31cece3b4e8b957fb84c360e87cbc
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C If\sthe\sGENERATED\skeyword\soccurs\sbefore\sthe\sAS\skeyword\sin\sa\scommon\stable\nexpression\s(CTE)\sdefinition,\sthen\sthat\sCTE\sbecomes\san\s"optimization\sbarrier".\nFor\snow,\sthat\smeans\sthe\sCTE\sis\salways\smaterialized.\s\sIt\salso\smeans\sthat\nquery\sflattener\sor\spushdown\soptimizations\sthat\scross\sthe\sCTE\sboundary\sare\nomitted.
- D 2021-02-13T23:46:26.876
 -C Add\stests\sfor\ssqlite3_column_count().
 -D 2021-02-15T14:32:05.655
++C Merge\sminor\sfixes\sfrom\strunk.
++D 2021-02-15T14:55:04.034
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1899,10 -1900,7 +1900,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 179c79ea0deb0f5adaa8d369cfcad06d959a9cc18a8a41e01ef013b2d90acd61 964ff68d8fa4d72b1b4d510f1ec62a9674b75d4ebae4ba254bc2f99432857628
- R 1e58442e28f61184e5599226680b1725
- T *branch * with-generated-as
- T *sym-with-generated-as *
- T -sym-trunk *
 -P 29c1932a47cd46c2585ebbf937c03544a8a355014776129662789e15db9ed4de
 -R f9be004d695acd30974fbbc52a7a4370
 -U dan
 -Z 4ef0a84d25d02d84a3a2cc2fe061f3e4
++P 186ec18b24d16c5d4d7a5b5e98c7504892950a1018774cb7bb214fc011ec09f4 7cc65ae57183b3c16f1102fca5603a36acda432e5d45e22a2996e5ebe069fc6a
++R a2f6f346026d9af00d1e82669d1b4d44
 +U drh
- Z 34848bab44cd045c96efef9184fac0b9
++Z acb715e4019dbfc9dce21a3fc5809594

diff --cc manifest.uuid
index 85159612dc9bb42a891eb0ab5a8e754a326ce786,5f39af6f20ba2a168b9a93daf235498d9fc20b32..c1ece15716876e485677aa8fe9b636b17696fcc1
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 186ec18b24d16c5d4d7a5b5e98c7504892950a1018774cb7bb214fc011ec09f4
 -7cc65ae57183b3c16f1102fca5603a36acda432e5d45e22a2996e5ebe069fc6a
++d876b287e1d1fdc1db083fb9786889fb82117ec77defdaa078858e1092068166