Sync w/trunk, pickup fts3corrupt6.test change.

FossilOrigin-Name: 268072f636b25c24ec47e34f2a8356f466ec200b80487b1041e89e0ae909c8bd

diff --cc manifest
index 89784a441ee3e4fce7f37cbca86a12ef57cfa51d,c26cbce7e5a9e789d9a3aadad98d856af046f868..e6f958ad839d673165e792fb5191a6eb93d1198d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C In\sCLI,\sdrop\s.dbinfo\scommand\swhen\sbuild\soptions\sprevent\sit\sfrom\sworking.
- D 2022-06-05T22:58:40.391
 -C fiddle:\sreplaced\sthe\shuge\sfile\sselection\swidget\swith\sa\ssmaller\sproxy\sbutton.
 -D 2022-06-06T06:29:09.527
++C Sync\sw/trunk,\spickup\sfts3corrupt6.test\schange.
++D 2022-06-06T14:00:41.074
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -571,7 -571,7 +571,7 @@@ F src/random.c 097dc8b31b8fba5a9aca1697
  F src/resolve.c a4eb3c617027fd049b07432f3b942ea7151fa793a332a11a7d0f58c9539e104f
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
  F src/select.c 8b98d3e5511d2789880ea4a12a4637803f69db5df04c81e1e93a5aac75c89b2a
- F src/shell.c.in 865218b56e28f5d5939b82ef98a11a692c30c773f6cd86e04939605ecf824adc
 -F src/shell.c.in 0d5b571b82d846ad916739eaf5e7873677a477eb5a99ebecac904db1426199de
++F src/shell.c.in 5d5f27f88c4661b2b6e6859890e9c7fe00eac9a628743a12c44632705fc38309
  F src/sqlite.h.in 172528c287399a34f188154017b7268bf82c6d5b780902e361958d2318c4e37c
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
@@@ -1975,8 -1975,8 +1975,9 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 8d942ba72ea995d0e8d1f8694bb428e5f919fc75afd3e059a69547e27991d580
- R 2f96e1736565174c18982a8437387e70
 -P 04b2e47784238008ce9057e2761ded91d895dc16d3bc8a3a3508df98a4769602
 -R e01c1c9b103ff33839cb70c2516ed17e
 -U stephan
 -Z 067dacc5bce2e6f4343da4553ebaf315
++P 2512d2f68dfff4d74c881a4102b63ca528e690ad93ab2b4eb1f03ce1d9ac155c f7c17449ea0685e322f50abe7a59b7afcde0f7e38e03645ec5b13753a6d0dcf3
++Q +04b2e47784238008ce9057e2761ded91d895dc16d3bc8a3a3508df98a4769602
++R 9207d306b462962d71351cad5c380553
 +U larrybr
- Z 9287eafb5d9d14c387b8d48b6146606a
++Z bff0aa34a1a107fc43ee5c4bae4c5b52
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index e8531888105f936702f8fe011fe51f8ddf1d5e26,044360c003f1674a5c5ce6b08d2f704b8f65eed5..e227f80eed75031b46be01a593a93e884134b929
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2512d2f68dfff4d74c881a4102b63ca528e690ad93ab2b4eb1f03ce1d9ac155c
 -f7c17449ea0685e322f50abe7a59b7afcde0f7e38e03645ec5b13753a6d0dcf3
++268072f636b25c24ec47e34f2a8356f466ec200b80487b1041e89e0ae909c8bd

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