Sync w/trunk

FossilOrigin-Name: a4c18b2f0ce4a0f4d0c4f4c25dc69fbed4cb4876d2b69e3e5e0e756410892d74

diff --cc manifest
index d4ace122574a90f8ca9043b2628218fdd58b8507,02f493c401b64db1f81759ed84d89d3113df93c7..6f2d72cf83d516f9c7b439c95f2829bbc7849d71
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sextra\stests\sfor\sthe\sgroup_concat()\sfix\son\sthis\sbranch.
- D 2021-09-29T14:14:16.714
 -C Fix\sa\spotential\sALTER\sTABLE\sproblem\swith\sexpressions\slike\s(\s(<sub-select>)\sIN\s()\s).
 -D 2021-09-28T10:44:54.441
++C Sync\sw/trunk
++D 2021-09-29T16:35:14.868
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -497,12 -497,12 +497,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 14d9098266fa712472bed757986eee70eb3613e9ba6e55bddac6708acf8d2857
+ F src/dbstat.c bea044cfe99eab6c527837e196a5335c128989bdb354cf1b4973b85ea561d66b
  F src/delete.c 3ce6af6b64c8b476de51ccc32da0cb3142d42e65754e1d8118addf65b8bcba15
- F src/expr.c 38597afb008db2e0a5f86a82827567acb98f502cab61663ef16bc688bc256803
+ F src/expr.c f2e0f5dd07d1b202f700f26b0851f2ea485e36ec8f335b05aec2cd91cd08853f
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c 1905af1821b88321e1bb9d6a69e704495b6844a9b6c29398d40117cc251e893c
 -F src/func.c 812ac5383067bed7150d8597e83c47b714d73db0e62af55811d1a145243e58e1
 +F src/func.c c852d68d0a984263f969e3b84d602c6d821147a32905fecca65b1d86098367b4
  F src/global.c 612ea60c9acbcb45754c2ed659b4a56936a06814718e969636fedc7e3b889808
  F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
  F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
@@@ -1927,7 -1926,7 +1927,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 98e0f2bf67cdee1da1edadeb54ff8564728b3f28fc821e46e8de201247c3fc87
- R 1629e1fee3aa6c55d78d8125420eddd7
 -P 6ab25f8bd52d6412a9600143de364f6d8ad8e2c835315fafca6f54d5f38a49dc
 -R 0b0aa479205f98d487986e0312e156bf
--U dan
- Z 18e23ea62384af634dfba68431ad5780
 -Z c883b6c925a98c67ff212863f29958e5
++P 3d148615f9d9c6a3d63d8eb015f3d70f453a66de49b28e665831254387c700b9 df0d7e36dbf98ab5405d8366ce92fb85176d4388b47a57b0ca1aa1ba6ae5212e
++R 4764117e20f212be49211212953ddad0
++U larrybr
++Z 559da611469829addf62248db5ff3864

diff --cc manifest.uuid
index 63426e4b1284d2a0d9cfc179bcf4205bb682258b,6cb2d24b62944595426cd56fa1358f433bd6a52c..43f8a3d717599213c39f0f4de0f5ce297270f2f1
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3d148615f9d9c6a3d63d8eb015f3d70f453a66de49b28e665831254387c700b9
 -df0d7e36dbf98ab5405d8366ce92fb85176d4388b47a57b0ca1aa1ba6ae5212e
++a4c18b2f0ce4a0f4d0c4f4c25dc69fbed4cb4876d2b69e3e5e0e756410892d74