Merge updates from trunk

FossilOrigin-Name: 35351371c5e9602dec210ad0926ff8a1a269556ce1a166e81eb0543938e0c57e

diff --cc manifest
index 4057ec873aac3ef11c939930abaad4f4a29d733a,f8e221911d2ca6e4a5224e2861363400301330af..dbfc97538a62572be680576d841eb77ba8ce147f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fixes\sto\sthe\sversion\sof\s"varsep"\sgroup_concat\sso\sthat\s(1)\sit\sbuilds\sunder\nseparate\scompilation\sand\s(2)\somits\stabs\sin\ssource\scode\sand\s(3)\sruns\sfaster\nthan\strunk.\s\sThis\svariant\sof\sthe\sgroup_concat_varsep\sbranch\smight\sbe\spreferred\nover\sthe\stip\sbecause\sit\spreserves\s(undocumented)\slegacy\sbehavior\sabout\sthe\nposition\sof\sseparators\srelative\sto\sterms.
- D 2021-10-01T00:25:06.629
 -C Fix\sa\sproblem\swith\sview\shandling\sin\sSQLITE_OMIT_VIRTUAL_TABLE\sbuilds.
 -D 2021-09-30T18:42:52.222
++C Merge\supdates\sfrom\strunk
++D 2021-10-01T02:16:52.236
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -497,12 -499,12 +499,12 @@@ F src/complete.c a3634ab1e687055cd002e1
  F src/ctime.c 8159d5f706551861c18ec6c8f6bdf105e15ea00367f05d9ab65d31a1077facc1
  F src/date.c e0632f335952b32401482d099321bbf12716b29d6e72836b53ae49683ebae4bf
  F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
- F src/dbstat.c bea044cfe99eab6c527837e196a5335c128989bdb354cf1b4973b85ea561d66b
+ F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
  F src/delete.c 3ce6af6b64c8b476de51ccc32da0cb3142d42e65754e1d8118addf65b8bcba15
- F src/expr.c f2e0f5dd07d1b202f700f26b0851f2ea485e36ec8f335b05aec2cd91cd08853f
+ F src/expr.c 82797e5d82422d34ede9a95ba459f40c317b2daadb21109a21abfd42f84e3ed8
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c 1905af1821b88321e1bb9d6a69e704495b6844a9b6c29398d40117cc251e893c
 -F src/func.c 812ac5383067bed7150d8597e83c47b714d73db0e62af55811d1a145243e58e1
 +F src/func.c 35e0beafdbd8e9d7050577668ab3f515b86d8aff18bb81603d961d9152955b16
  F src/global.c 612ea60c9acbcb45754c2ed659b4a56936a06814718e969636fedc7e3b889808
  F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
  F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
@@@ -1927,10 -1928,7 +1929,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 a4c18b2f0ce4a0f4d0c4f4c25dc69fbed4cb4876d2b69e3e5e0e756410892d74
- R 247138f3b5e489fa491f98b9cd97dbe7
- T *branch * group_concat-fix-legacy
- T *sym-group_concat-fix-legacy *
- T -sym-group_concat_varsep *
 -P a300adc21151fb70ab8573477fd89a10300ee678f068fe123f22ada2f1f876d2
 -R 92a62ddf3c003fbdf03af7f31b764e73
 -U dan
 -Z 6842d9a35eaf3ec77461f481929e2588
++P 04399cf9645e04b171090ff8a3c27752929c10d2cd8778e26f8f3337aa902ab6 6e791a24ce259ff6cc46a7c2188aea094a5021e154368f57019a0653c8a81217
++R d3b716f0cf9b6ef6a1679ee563e22ef8
 +U drh
- Z 89839e6f88669e9a8e94fe2639f687c4
++Z f141141cc66d39890f48912f4e8ef81f

diff --cc manifest.uuid
index fede5e072e9b75d7bba8eb4a3660f82019567bcf,d636c50acd07a9ecdfcc815bb5b38c7c36268573..1c635395f027c2ced522a425e70e1eb9b1cf9fe6
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 04399cf9645e04b171090ff8a3c27752929c10d2cd8778e26f8f3337aa902ab6
 -6e791a24ce259ff6cc46a7c2188aea094a5021e154368f57019a0653c8a81217
++35351371c5e9602dec210ad0926ff8a1a269556ce1a166e81eb0543938e0c57e