Merge trunk changes into this branch.

FossilOrigin-Name: f15d51054afb1e3fec87938f2b04a5a0d0611b08248367850450de7c4166e3d1

diff --cc manifest
index a8f815b6d63e0a4812c052e3569c613c4526147a,3349d89c12b1011212813f18133e8c6208be4687..1e4bac5ad73891e87588980f6ce691330b3c0293
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sinternal\sSQL\sfunction\ssqlite_rename_quotefix().\sFor\sconverting\sdouble-quoted\sstrings\sto\stheir\ssingle-quoted\scounterparts\sin\sDDL\sstatements.
- D 2021-03-15T20:22:34.220
 -C Fix\sa\sproblem\swith\sALTER\sTABLE\sRENAME\sCOLUMN\swhen\sused\son\sa\sschema\sthat\sfeatures\sgenerated\scolumns.
 -D 2021-03-16T11:11:07.514
++C Merge\strunk\schanges\sinto\sthis\sbranch.
++D 2021-03-16T11:21:36.460
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -476,7 -476,7 +476,7 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
- F src/alter.c 3be93b32c606533808b8ca785d6c4adb55fced922f61ed9e8ba61e9764df9ebf
 -F src/alter.c 2d631213818b654faaf08755f26e934134c4769757ae9286981401cd6b571081
++F src/alter.c 36ff6fed67e383e65238e0a063795f0645a3eb3420cdacc3463d822874ecc06a
  F src/analyze.c 01c6c6765cb4d40b473b71d85535093730770bb186f2f473abac25f07fcdee5c
  F src/attach.c 9cbe761e464025694df8e6f6ee4d9f41432c3a255ca9443ccbb4130eeb87cf72
  F src/auth.c 08954fdc4cc2da5264ba5b75cfd90b67a6fc7d1710a02ccf917c38eadec77853
@@@ -540,10 -540,10 +540,10 @@@ F src/pragma.h 8dc78ab7e9ec6ce3ded83328
  F src/prepare.c e21b54489b5c73b06ada15e6fc79b5c6f64b06701924a6ca98944ae59e06256f
  F src/printf.c 2b03a80d7c11bb422115dca175a18bf430e9c9dbaa0eee63b758f0c022f8f34f
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 -F src/resolve.c dd47248c2c914feb0d4428c27d782e2723971d32cfa5536f49306d080df4d45a
 +F src/resolve.c d95db73d3e6a5c689e5f6604b4d2521350e45f2a0f0f84f5a2dc2bfee56580a0
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
  F src/select.c fc904a7aa7ebfd5c7a57a0141d829c9f5388ac7773e0d1d9668768c1bbc87fc3
- F src/shell.c.in 35adf1212d759069b00e468a9304a05a67710c8f8f50e7312335e23cac985d8c
+ F src/shell.c.in 8df3912a7ca4873a1443d4adef1b25baee8c086ab479fd9c4f13ab03f98049ab
  F src/sqlite.h.in 3426a080ea1f222a73e3bd91e7eacbd30570a0117c03d42c6dde606f33e5e318
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e
@@@ -1911,10 -1910,7 +1911,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 d9f8f488ff9d47fe7bb8838e683bae4fea038f7278ef885ecf292143a0dd88ed
- R 648b014b70c7f6df9ebb9162a19c79e7
- T *branch * alter-quotefix
- T *sym-alter-quotefix *
- T -sym-trunk *
 -P aea12399bf1fdc76af43499d4624c3afa17c3e6c2459b71c195804bb98def66a
 -R 8d9ba034916265e30952367e14ccf2d0
++P d874b300463ce0bbb53b7e2f88c6a12893e4fd751fcc7f810077ba108f4061ef 0e255b26872b50581d470952dd98e21dd82d081885006f58d49daa4b4576b35d
++R 5cdc3c3d5c2d0efb3f1add4791367d78
  U dan
- Z bed13b8bcfee4ae93f7eef5cee7d76af
 -Z 66abaaaa0bcfb13bbe669b759bf47eeb
++Z f7f517381588ea598ea089070b1ed19b

diff --cc manifest.uuid
index 855047c6596f93aaf8bd533706ee27a1c0b6978a,bed7091db56cd908021496153528863ea347a09e..68fe878edccf3f753cdaa598edb4a95f5d25aaaa
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d874b300463ce0bbb53b7e2f88c6a12893e4fd751fcc7f810077ba108f4061ef
 -0e255b26872b50581d470952dd98e21dd82d081885006f58d49daa4b4576b35d
++f15d51054afb1e3fec87938f2b04a5a0d0611b08248367850450de7c4166e3d1

diff --cc src/alter.c
Simple merge