Merge the latest fixes from trunk.

FossilOrigin-Name: 1ba3b3ccf145d84fa75afabe2fa925f65e43f815b25b15bd60073a41aa97bf57

diff --cc manifest
index b50049c60c68c33ee21b96080c3a81d6cbddc23d,275be40dfb48ce50e53eb68dcc73d8feba7c8b6b..c0b527257735fccf6a30ef95c36149e09b3af45c
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
--C Improved\scomment\sfield\sin\sthe\sbytecode\sgenerated\sfor\sOP_Column\sand\sOP_Rowid.
- D 2022-04-18T13:57:57.631
 -D 2022-04-18T14:15:07.659
++C Merge\sthe\slatest\sfixes\sfrom\strunk.
++D 2022-04-18T14:41:24.045
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -503,9 -503,9 +503,9 @@@ F src/date.c 15082566229d4b1e5f24fdb490
  F src/dbpage.c 90661a87e1db8bfbc8d2ebbdcd3749651ddb287c555c07a28fb17c7c591ffb68
  F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
  F src/delete.c a8e844af211a48b13b5b358be77a12c860c6a557c21990ad51a548e2536500ce
 -F src/expr.c 1d9a1eefd803c9f9b1cfed9015589157de173e0994b7a73e2d9cf5a267a77449
 +F src/expr.c 0714987d576d13acb64630274677ff0df336013bf83dfc1ff24a339b8ae2ae81
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
- F src/fkey.c 94927f9b46d72a9cb858c208febf04ceb0a3270c5fa5fd0b7f436cf16e09f72a
+ F src/fkey.c d965ede15d8360c09ed59348940649ee647b192e784466837d7aefa836d1d91e
  F src/func.c a3407a6fbb0d4088d8d502e46f0ace63e0aeae7467ae23a9ca9815bbf9239761
  F src/global.c e83ee571b79ee3adc32e380cf554cf1254bc43763d23786c71721fbcdfbbb965
  F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
@@@ -550,10 -550,10 +550,10 @@@ F src/pragma.h e690a356c18e98414d2e870e
  F src/prepare.c fd940149c691684e7c1073c3787a7170e44852b02d1275d2e30a5b58e89cfcaf
  F src/printf.c 05d8dfd2018bc4fc3ddb8b37eb97ccef7abf985643fa1caebdcf2916ca90fa32
  F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 -F src/resolve.c 18d99e7146852d6064559561769fcca0743eb32b14a97da6dbed373a30ee0e76
 +F src/resolve.c ce4cb0889f1bf5990b698740b88026385cf6f30222fde1f02a3168bb780eb579
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 -F src/select.c 5ac7c08646ac5a03634da8a954645bdaa13d9bf692fb6b0b5fb3b55b19ab884e
 +F src/select.c 6544e02167adbb89a7152acf6ff2f0218a6de94146377b83e79bc8b09bf6f16e
- F src/shell.c.in eb7f10d5e2c47bd014d92ec5db1def21fcc1ed56ffaaa4ee715b6c37c370b47f
+ F src/shell.c.in ecff6f4ab0e8e25acd578b3eb27ac0bad4d48643c160259a277151d6e9d412e1
  F src/sqlite.h.in 2a35f62185eb5e7ecc64a2f68442b538ce9be74f80f28a00abc24837edcf1c17
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h f49e28c25bd941e79794db5415fdf7b202deb3bc072ed6f1ed273d578703684e
@@@ -1948,8 -1945,9 +1948,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 9168cbbedd1c9d735279295a78212d830e24269f6d7e445e71faa2c06973223d
- R a4c354da2123e1486588766b1d4b51f3
 -P 82366436ef74838dae1f379f3e5b8ad187225a30ec58fb49f047ab7c08a263cf
 -Q +009bbf8026106c5a74cced06cced48badb870a4b6e6a2f8104a544d2a8d79e45
 -R 7ec2e027f14c1113394a6f2b89ad97e8
++P 009bbf8026106c5a74cced06cced48badb870a4b6e6a2f8104a544d2a8d79e45 1b2c5cef9560123344db391cd065090d1914724715ec6643d2d9b5fac2051a21
++R 7231a9090bdeb7be15e705cd24ff1359
  U drh
- Z 78587092c64ce3133bf29634c7d55b8b
 -Z 913b185da9d2fc4d6a61edeeeba6fe46
++Z 90235891d6fa6cd74fed426055fa90a6
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index a668ebd610a11cea2164452de4fc1ead34e59a61,da113a594171a245120eefc0d7b651036be0a3be..db6197b4412c19742afb013cc2c1804a485d7f05
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 009bbf8026106c5a74cced06cced48badb870a4b6e6a2f8104a544d2a8d79e45
 -1b2c5cef9560123344db391cd065090d1914724715ec6643d2d9b5fac2051a21
++1ba3b3ccf145d84fa75afabe2fa925f65e43f815b25b15bd60073a41aa97bf57