Merge recent trunk fixes into the nan-inf branch.

FossilOrigin-Name: 248bf629454b56a82dbfb550320900fdb7e575928ece45772afe7ebe8d7f0f81

diff --cc manifest
index 9e9cd4d4541b51fceb3121ecd8105df5ec58c9df,55d58b9c3bd60248b7ac11cc8fedd0e356b828c1..5e1a73fecc32519dcf7f01fe39ac0406dc2c03a8
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\stest\scases\sso\sthat\sthey\swork\swhen\sSQLITE_ENABLE_NAN_INF\sis\sdefined.
- D 2023-03-23T19:22:54.195
 -C Another\s#ifdef\sto\somit\scode\sthat\sis\sonly\sused\sby\sSTAT4.
 -D 2023-03-29T15:16:29.589
++C Merge\srecent\strunk\sfixes\sinto\sthe\snan-inf\sbranch.
++D 2023-03-29T16:28:13.253
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -574,20 -574,20 +574,20 @@@ F src/ctime.c 534fa410fd717337300f4bfc3
  F src/date.c f21815ca7172ce073db3163ac54c8d9f2841077165c1a6123b4d1c376a0c7ec7
  F src/dbpage.c d47549716549311f79dc39fe5c8fb19390a6eb2c960f8e37c89a9c4de0c1052e
  F src/dbstat.c ec92074baa61d883de58c945162d9e666c13cd7cf3a23bc38b4d1c4d0b2c2bef
- F src/delete.c 201fe0763c52783d205c8c13cdd9d55c1bd5cb21c1f036753f99103b43284b90
- F src/expr.c f4a6c233ce86d359905afd78a1ef436bfe44160b6c71ae74b2239a9cfeca7734
+ F src/delete.c a9c6d3f51c0a31e9b831e0a0580a98d702904b42d216fee530940e40dec34873
 -F src/expr.c bf74dd13f36dfc57c2a397f3d41cf9ea35ffd17f9baed1db51bd8736b276d4b1
++F src/expr.c 7feb92a99e2c3472b16d7341fa51a32bebd2c07afe34b86f3ca3b8975e3b0bb9
  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
  F src/hwtime.h b638809e083b601b618df877b2e89cb87c2a47a01f4def10be4c4ebb54664ac7
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 7940fce7d4aa855606432d82d20694e17c18a03956f5f5776f2404e2df7c18a8
+ F src/insert.c a8de1db43335fc4946370a7a7e47d89975ad678ddb15078a150e993ba2fb37d4
 -F src/json.c 9e3a6acf9e4fa8bb6c84a38538ed9c2f9ad09f106910ef0e9cc68e19c8dc4fc8
 +F src/json.c 29375e70f76339679dbe03a7d71e32186a789ac33b2a2c7285aa9852279b7e67
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
- F src/loadext.c b04eb648cedc45efe4298e1ef439ac4f0096ae27b5f01accb0a1f49d57789128
+ F src/loadext.c be5af440f3192c58681b5d43167dbca3ccbfce394d89faa22378a14264781136
  F src/main.c 09bc5191f75dc48fc4dfddda143cb864c0c3dbc3297eb9a9c8e01fea58ff847d
  F src/malloc.c 47b82c5daad557d9b963e3873e99c22570fb470719082c6658bf64e3012f7d23
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
@@@ -630,7 -630,7 +630,7 @@@ F src/shell.c.in d80b53a9ec0a43ac0157fc
  F src/sqlite.h.in f01033703156615566bb329144d736a37fc35a278049db91127782a9c799b938
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
- F src/sqliteInt.h 33d4aff63f8768a8b55456640cc3f24a9cd12907b2496db2f68bd22036744f2e
 -F src/sqliteInt.h 2a3331b16b70b0b56c65574bf3e4f749ccf493787ca6550a29dc389cad28bb34
++F src/sqliteInt.h 5291d87b9c81f359e595f63bf14334f0a346889a830dc936251628144ac31091
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -689,19 -689,19 +689,19 @@@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
  F src/tokenize.c 1305797eab3542a0896b552c6e7669c972c1468e11e92b370533c1f37a37082b
  F src/treeview.c fccf3b8c517c1f55cb380c1522febe6921fcb2bd800c16c78cab571d0eb0ccbd
- F src/trigger.c f34367fad4df451b5dfe63fcc1d384fd16e40077e42092b1c3682dedeef5a7e3
- F src/update.c 76664e1beae86e8e961983ebe19a4ee9ebd7e26683ead2b288ba08f81fc7ba4e
+ F src/trigger.c ad6ab9452715fa9a8075442e15196022275b414b9141b566af8cdb7a1605f2b0
+ 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 1838a91623c34719bf50a161bb73af4b437a2c4293168acaaafa444618de1fc5
 -F src/vdbe.c a6c52ba65e8ceb574fe0eda62af84e6c50c176ffc5f310c613425f7ab2b1484b
++F src/vdbe.c c62c3fe9dcbff2abed1f778a77859806804f8b07320366540580b3ca35b13977
  F src/vdbe.h 73b904a6b3bb27f308c6cc287a5751ebc7f1f89456be0ed068a12b92844c6e8c
  F src/vdbeInt.h a4147a4ddf613cb1bcb555ace9e9e74a9c099d65facd88155f191b1fb4d74cfb
  F src/vdbeapi.c 40c47b1528d308a322203de21d2e0d711753257ed9771771b6129214b1d65932
 -F src/vdbeaux.c 0f5201346a83a35a08e833c3a03abe626119c07b7361c28bc6a259b98540f1d6
 +F src/vdbeaux.c 7c8ea5a1ba0602332a1e335f95779c1a8d69421fdbc55a634c667bfadbb5d2e1
  F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
- F src/vdbemem.c 46d182099c2d531dd1711d70e76ab0415783382d6f73abdc35ff6244851970d9
 -F src/vdbemem.c db0458d11a51f6cfad2333a41e36a3795be0b2f316d070df5d33543a9ac884ac
++F src/vdbemem.c b1a053acb5a999e45736c2bfa33508fbb652ffeac5851c386a84be70356e303d
  F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
  F src/vdbevtab.c aae4bd769410eb7e1d02c42613eec961d514459b1c3c1c63cfc84e92a137daac
@@@ -2051,8 -2051,8 +2051,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 0aecf360fbc8ece7decf95132349ac58bca532aaa0655541023771f5a3cdea83
- R d6286852d3ebc9c14df55956bf4f556c
 -P 09a9b30ba7828a487a33a3ebf8028dfaa147dff67d2724584123b90a88d9814b
 -R 0b2f665677a5709c67b05890c7e30712
++P 95c7af79cf55a333d35556877be2d8d4af95161a84fc8bc7c81ee71072bf3e6a 445c75567de9bf9c8075dfc62c60dc4abeefab59c7803a5ef2cc5d69c08d7633
++R 1add760bfe9c24c8779512c4da4f453e
  U drh
- Z 363c17f88d43eb10c53e8426c3c93b8b
 -Z 32665a8d3990ec1291de16f5a821ea1c
++Z 062ce255902c2b12a71a2d5de337f141
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 5923d5e43b205b240230535c9b5b0ae99a5159ae,9f5b85ecaf1402209445abcf1e401b2e019cf110..ca3d2c8048ae9878dca450e04a838234b5a4fff9
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 95c7af79cf55a333d35556877be2d8d4af95161a84fc8bc7c81ee71072bf3e6a
 -445c75567de9bf9c8075dfc62c60dc4abeefab59c7803a5ef2cc5d69c08d7633
++248bf629454b56a82dbfb550320900fdb7e575928ece45772afe7ebe8d7f0f81

diff --cc src/expr.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbemem.c
Simple merge