Sync to trunk

FossilOrigin-Name: dd356ace4ffa57518c16fa7fd9b6bc7bef0bb0ddcbc9bdf60ab0a17c25f8e5c0

diff --cc manifest
index 8126f7423ba8843193110b19698d287040441cea,969df8ecab1d1bbe6d69486432b3d6c827897b5a..e0bb5175008e7c5e50f4718bf885e937c329f871
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
 -C Further\simprovements\sto\sthe\seOpenState\sbit\svalues.
 -D 2021-08-09T18:13:38.173
 +C Sync\sto\strunk
- D 2021-07-31T19:37:56.008
++D 2021-08-09T19:15:03.129
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -542,10 -542,10 +542,10 @@@ F src/pragma.h a11b4798f9c49f156f130e1f
  F src/prepare.c 0d53d20532aada295c1690792a125adbd6435f5ce703ff0adf1b9b3605238b67
  F src/printf.c 78fabb49b9ac9a12dd1c89d744abdc9b67fd3205e62967e158f78b965a29ec4b
  F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
- F src/resolve.c 047a822844cea769f6fdd8418a335dd4bcd8b75ab5e264f2506a0804f869b562
+ F src/resolve.c 42b94d37a54200707a95566eff4f7e8a380e32d080016b699f23bd79a73a5028
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 99c36dd4e7c2207ebdfd8c30986ab5aaeae74d0cdbbc471420807d50c417c241
- F src/shell.c.in fbc62e5ac7f79dd5f31fcd4ca719bc9cc959e147ae8fbb8630883a250a539b54
+ F src/select.c 63077c0243ded1432d97c90c1a4c3419b3a574b36634c674599a68bfe4c3bdc2
 -F src/shell.c.in f795a4ae3c35631f5edcfa754c7824ff1d8a75b23a07e22e664b50f82e826346
++F src/shell.c.in 92fbe48f2b96c62a57ca17530624f61a4076d17ec082dd1da09e19d6792051e9
  F src/sqlite.h.in 43fcf0fe2af04081f420a906fc020bde1243851ba44b0aa567a27f94bf8c3145
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h e97f4e9b509408fea4c4e9bef5a41608dfac343b4d3c7a990dedde1e19af9510
@@@ -1920,7 -1920,7 +1920,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 0d41f7f93c273cd2d0b92269ac1705f66daefa4eb7c24ed8f3662ef45a5397f9 d2da62a9df63036b02dadca3798de9e623c2680b3ef0c37d2b18bb88693afd7f
- R 59d1873fa96dbc489fa2d2a6c0fc8066
 -P bf9d70fc2fde06a3f132270a26d4abe321687169066aff26ad9e92757c7f9ee4
 -R a9151e310251de143fbd3b8abd808680
 -U mistachkin
 -Z e0914599a10f85fbe60bdb3fef5eb7e0
++P d449941b81a796fa30382bd00e88dc744a6745dc3d5a0eb8377aa90e4966a391 d44f74f14a387960ce105913526b572f4a3d1935351c6aab10cee85946488a9e
++R 7070e57e23b183c775afc6963903e7ac
 +U larrybr
- Z d73f10d55ae7d3c2f75b743673dac0f0
++Z 9e19bb94e770b4ba1f8a18c5933850e6

diff --cc manifest.uuid
index ce080aaab1faf736c415a92c0dd3e386ad321a61,b870135606872aafbf88428a6c8d220e24da092c..13b73e4aee8139fa9eb7df53a8b4ec532faebf4b
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d449941b81a796fa30382bd00e88dc744a6745dc3d5a0eb8377aa90e4966a391
 -d44f74f14a387960ce105913526b572f4a3d1935351c6aab10cee85946488a9e
++dd356ace4ffa57518c16fa7fd9b6bc7bef0bb0ddcbc9bdf60ab0a17c25f8e5c0

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