Merge recent trunk fixes into the nan-inf branch.

FossilOrigin-Name: a51fb9d72cab77eb1e6f9d6344adaf60b7fd212888bface4551602d820a7657f

diff --cc manifest
index 419848b7b2247466e211692475b195dd497ee3b5,0dac7c6ea6b77851b786d8e1f7c3eb445a294353..0d19371bcdb8709baee6b0c3577338df3b1a4326
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Back\sout\selements\s(1)\sand\s(2)\sfrom\s[96ec8306457eebf5].
- D 2023-03-29T17:26:16.998
 -C Earlier\serror\sdetection\sfor\sindex\sexpression\susage\sby\saggregate\sfunctions.\ndbsqlfuzz\s29214ace4e25c98d2ddff8fbcf97afdda23f28b9
 -D 2023-03-30T19:05:48.274
++C Merge\srecent\strunk\sfixes\sinto\sthe\snan-inf\sbranch.
++D 2023-03-31T16:27:58.658
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -575,10 -575,10 +575,10 @@@ F src/date.c f21815ca7172ce073db3163ac5
  F src/dbpage.c d47549716549311f79dc39fe5c8fb19390a6eb2c960f8e37c89a9c4de0c1052e
  F src/dbstat.c ec92074baa61d883de58c945162d9e666c13cd7cf3a23bc38b4d1c4d0b2c2bef
  F src/delete.c a9c6d3f51c0a31e9b831e0a0580a98d702904b42d216fee530940e40dec34873
- F src/expr.c bf74dd13f36dfc57c2a397f3d41cf9ea35ffd17f9baed1db51bd8736b276d4b1
+ F src/expr.c 5f2b5f25a90aa4ff1c84d175b1adf790be8f8719f3b38851e2b5b293e0e5e916
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
 -F src/func.c d187be57a886ddf4e6b7ef584a494361899be3df5eee6d4a747b68ff4aff4122
 +F src/func.c 858f7a1ce2ae27f22564e7336b7f06206c262577c22a8720be45690828a4fe4f
  F src/global.c 428d2580a1cdf5dbe1f356d1feab83710ae0cc862ece0fb57bc8259e43838c74
  F src/hash.c c6af5f96a7a76d000f07c5402c48c318c2566beecdee9e78b9d9f60ce7119565
  F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
@@@ -693,12 -693,12 +693,12 @@@ F src/trigger.c ad6ab9452715fa9a8075442
  F src/update.c 3f4fb5ad7c9b48d7911974d6579192bb3a6c27f46140b6cbb9139cc8a77b8691
  F src/upsert.c 5303dc6c518fa7d4b280ec65170f465c7a70b7ac2b22491598f6d0b4875b3145
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 -F src/util.c 3ff7bc2b48dd425b1448304bb86273b05da1621f136d51dbb9789f8803559a1f
 +F src/util.c be2f2ba283ecfcd39a92c26a4f27ba39d295da35ad29ef551998c174818545ef
  F src/vacuum.c 84ce7f01f8a7a08748e107a441db83bcec13970190ddcb0c9ff522adbc1c23fd
 -F src/vdbe.c a6c52ba65e8ceb574fe0eda62af84e6c50c176ffc5f310c613425f7ab2b1484b
 +F src/vdbe.c 61cb236aef7a578dbd8966f53860e03e986b5c84912ceaf71441a3f64fe07022
  F src/vdbe.h 73b904a6b3bb27f308c6cc287a5751ebc7f1f89456be0ed068a12b92844c6e8c
  F src/vdbeInt.h a4147a4ddf613cb1bcb555ace9e9e74a9c099d65facd88155f191b1fb4d74cfb
- F src/vdbeapi.c 40c47b1528d308a322203de21d2e0d711753257ed9771771b6129214b1d65932
+ F src/vdbeapi.c 998d240b3afd78df3581d545240330ca4cc09ecd10d0af730fe364f1c7eb253d
  F src/vdbeaux.c 0f5201346a83a35a08e833c3a03abe626119c07b7361c28bc6a259b98540f1d6
  F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
  F src/vdbemem.c db0458d11a51f6cfad2333a41e36a3795be0b2f316d070df5d33543a9ac884ac
@@@ -2051,8 -2052,8 +2052,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 248bf629454b56a82dbfb550320900fdb7e575928ece45772afe7ebe8d7f0f81
- R 9d87ab4f5b2c110369afb418d4c850e2
 -P 960a488a2db92f5437bc8171cdbed44618d9381c57fd41b2f0e357b6012c80b5
 -R 4f561ce7d94ebba6771f71291846cad2
++P d8b17615f129b40b751b1642cdd3482181e7f181bb930a2bd793eec771a7b10e 8e841e7f025f7205959453875f2d9db36271642045593970a2b2fc20b2f847c3
++R fafa72d365cc94d46e13b1f30fd4c09c
  U drh
- Z 6d98a63fa967166db5a3bf39868e410c
 -Z 91fc03feb4d1edcaf09570adbf0b39df
++Z 9fdad37f67f1b67c950492277bf151ea
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 91e83b3e9f7be8766a445da2f5722d6084a6d0e6,17864e80e2bec3d8caf51c6cd5419aaa36810262..af689c65c880ee02ef4b797701792f44c249b351
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d8b17615f129b40b751b1642cdd3482181e7f181bb930a2bd793eec771a7b10e
 -8e841e7f025f7205959453875f2d9db36271642045593970a2b2fc20b2f847c3
++a51fb9d72cab77eb1e6f9d6344adaf60b7fd212888bface4551602d820a7657f