Sync w/trunk, including all CLI updates

FossilOrigin-Name: ad8b48d6326b253e5d62dd262130820e4e6e56896abf17ddc6f1f7802204503a

diff --cc manifest
index 51b4322c42a5a8bd6fa5da5ad766e5433c1dced0,9e29deaa06ac525dcac5b61910e1b1dc87ac1b47..55d493b3daceec092969f1fee3d9aa1e41937618
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C For\sshell,\ssilence\ssome\sclang\swarnings,\sand\scure\sone\sbona-fide\sgripe.
- D 2022-04-08T03:40:05.593
 -C Fix\stwo\sunreachable\sbranches\sintroduced\sby\sthe\srecent\nsqlite3TriggersExist()\soptimization.
 -D 2022-04-07T20:45:38.697
++C Sync\sw/trunk,\sincluding\sall\sCLI\supdates
++D 2022-04-08T04:24:34.844
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -553,11 -550,10 +553,11 @@@ F src/pragma.h e690a356c18e98414d2e870e
  F src/prepare.c fd940149c691684e7c1073c3787a7170e44852b02d1275d2e30a5b58e89cfcaf
  F src/printf.c 05d8dfd2018bc4fc3ddb8b37eb97ccef7abf985643fa1caebdcf2916ca90fa32
  F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
- F src/resolve.c ea935b87d6fb36c78b70cdc7b28561dc8f33f2ef37048389549c7b5ef9b0ba5e
+ F src/resolve.c 18d99e7146852d6064559561769fcca0743eb32b14a97da6dbed373a30ee0e76
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c c366c05e48e836ea04f8ecefb9c1225745dc250c3f01bdb39e9cbb0dc25e3610
- F src/shell.c.in 7776a6657604a00e9f63aac47ba782f4091f298c08b55d477a658faf79257204 x
+ F src/select.c d6c04eb93395024af80f61a8c278a33c2a0333aeb7d57bb6aa737a6f1c4af4b8
 -F src/shell.c.in 1a8fbf932ecd582b1a5f66c1e8294f92c30d954616f5c7cc54c9623fcdbb028d
++F src/shell.c.in a32d50c687fc79e4d19992810dfa358d0342f4b9e464f791e6db011cc6c5f0ec
 +F src/shext_linkage.h 8a3990b43db032451e8ea04030ed67d99b15c7af10400032e9e8f6985e88ff73
  F src/sqlite.h.in 2a35f62185eb5e7ecc64a2f68442b538ce9be74f80f28a00abc24837edcf1c17
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h f49e28c25bd941e79794db5415fdf7b202deb3bc072ed6f1ed273d578703684e
@@@ -1951,8 -1945,8 +1951,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P aa785473d948b9f05f32c2107fb302374573a2906d867b4599a7063943277b0f
- R 56075a3576ea3234aa59180bfb50420a
 -P c2965fea9df7076b235d3eadaf84f0a36242476d0329030b0e57557b66e2540c
 -R 07d0b0c26e9cd2798bbb00ddbafc6a3b
 -U drh
 -Z 93237070ff101cf9292ceb1ee884c28a
++P 52be86685006ac66cce79a7d8026d671030b308823c6ba427b52377591ba7064 1b5475d212cf9de0bff69eee8c607b4fcd8e04bf4df72171429e7609c4153951
++R da63d16a878892655dc7695acf7c75f4
 +U larrybr
- Z 13655dab6a777a188e42ca713dec502b
++Z 6053491e5a01d46a84a7d2c19c674132
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 76014cb5a7412ff46e57a01902f034a27138720e,55edbcf9bb5639b81374977a61ae7e28c91ce627..c0135891e4e8dd526c9db1b781fdaf61deaa17a5
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 52be86685006ac66cce79a7d8026d671030b308823c6ba427b52377591ba7064
 -1b5475d212cf9de0bff69eee8c607b4fcd8e04bf4df72171429e7609c4153951
++ad8b48d6326b253e5d62dd262130820e4e6e56896abf17ddc6f1f7802204503a

diff --cc src/shell.c.in
index 00fe32a09802fa3f2d0dbb6e1d1409aa9a2efb66,452e8b9cb1bf5f43a2a79075a319358f3733cd56..169240dadb8444643f368149700c1d993206be7e
mode 100755,100644..100644
--- 1/src/shell.c.in
--- 2/src/shell.c.in
+++ b/src/shell.c.in
@@@ -3531,16 -3017,16 +3535,16 @@@ static void explain_data_prepare(ShellI
        shell_check_oom(abYield);
      }
      abYield[iOp] = str_in_array(zOp, azYield);
 -    p->aiIndent[iOp] = 0;
 -    p->nIndent = iOp+1;
 +    psi->aiIndent[iOp] = 0;
 +    psi->nIndent = iOp+1;
  
-     if( str_in_array(zOp, azNext) ){
+     if( str_in_array(zOp, azNext) && p2op>0 ){
 -      for(i=p2op; i<iOp; i++) p->aiIndent[i] += 2;
 +      for(i=p2op; i<iOp; i++) psi->aiIndent[i] += 2;
      }
 -    if( str_in_array(zOp, azGoto) && p2op<p->nIndent
 +    if( str_in_array(zOp, azGoto) && p2op<psi->nIndent
       && (abYield[p2op] || sqlite3_column_int(pSql, 2))
      ){
 -      for(i=p2op; i<iOp; i++) p->aiIndent[i] += 2;
 +      for(i=p2op; i<iOp; i++) psi->aiIndent[i] += 2;
      }
    }