Merge trunk changes with this branch.

FossilOrigin-Name: 5f66eb4e2603278dcc9dbfe4bf506cba1aa03180cfb492a0dfc3a8be32cc994b

diff --cc ext/fts5/fts5_index.c
Simple merge

diff --cc manifest
index a45f1f64f34c4fd7329d712bc00ea4abb24ab2a9,b55679b3ff8a7f9c4d9a2b8bc65fd9382c14f323..e3c3bd85931ded0a15bcd66c4287e8c2aca79551
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\scases\swhere\sa\srow\sis\sinserted\sinto\sa\scontentless_delete=1\sfts5\stable\sand\sthen\sdeleted\swithin\sthe\ssame\stransaction.
- D 2023-07-17T18:40:39.967
 -C Fix\sa\sbuffer\soverrun\sin\sfts5\sthat\scould\soccur\sin\s'secure-delete'\smode\swhen\sdealing\swith\scorrupt\sdatabase\srecords.
 -D 2023-07-18T13:55:19.822
++C Merge\strunk\schanges\swith\sthis\sbranch.
++D 2023-07-18T13:55:55.856
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -86,15 -86,15 +86,15 @@@ F ext/fts3/unicode/mkunicode.tcl d5aebf
  F ext/fts3/unicode/parseunicode.tcl a981bd6466d12dd17967515801c3ff23f74a281be1a03cf1e6f52a6959fc77eb
  F ext/fts5/extract_api_docs.tcl a36e54ec777172ddd3f9a88daf593b00848368e0
  F ext/fts5/fts5.h c132a9323f22a972c4c93a8d5a3d901113a6e612faf30ca8e695788438c5ca2a
 -F ext/fts5/fts5Int.h ed48a096418ff4a7c02ac9bd1e8d40c46de21b79a132b8b08d3f32233703de7d
 +F ext/fts5/fts5Int.h fa9dd8ecbda6340f406c6f21b9b524b4666817aa89850e60a42937eea87cef6a
  F ext/fts5/fts5_aux.c 572d5ec92ba7301df2fea3258576332f2f4d2dfd66d8263afd157d9deceac480
  F ext/fts5/fts5_buffer.c 3001fbabb585d6de52947b44b455235072b741038391f830d6b729225eeaf6a5
 -F ext/fts5/fts5_config.c 051056a9052f5d3a4d1c695f996fd364f920e341f136c60ab2c04aa7e267113f
 -F ext/fts5/fts5_expr.c 58fb8ceddfb1cefcd54510f9f2f33c220ef9d1b3fa77462111f5ae2a825ab7b1
 +F ext/fts5/fts5_config.c 010fabcc0aaa0dfa76b19146e8bddf7de368933eeac01e294af6607447500caa
 +F ext/fts5/fts5_expr.c 2473c13542f463cae4b938c498d6193c90d38ea1a2a4f9849c0479736e50d24d
  F ext/fts5/fts5_hash.c d4fb70940359f2120ccd1de7ffe64cc3efe65de9e8995b822cd536ff64c96982
- F ext/fts5/fts5_index.c 8e5fd1f1eb9489f1ba2eff2d3667ffd78a8d936c1180d284ccc6c37f25953a8f
 -F ext/fts5/fts5_index.c ab6809cdee08c2698147e3e266378978ea75b2da3010fedc91830313f8bc587e
 -F ext/fts5/fts5_main.c b4dba04a36aaf9b8e8cef0100b6dbb422cc74753eacc11d6401cac7a87c0f38d
 -F ext/fts5/fts5_storage.c 76c6085239eb44424004c022e9da17a5ecd5aaec859fba90ad47d3b08f4c8082
++F ext/fts5/fts5_index.c 109d8a75ee8a25fa19eb54073e2fc74385e79460e75ddf74a218475d20ab2c33
 +F ext/fts5/fts5_main.c ede405f0f11db562653b988d043a531daa66093b46c1b35b8fcddb54819cba84
 +F ext/fts5/fts5_storage.c 7d22c8ea1d484134bd715f55b370ae9b5a830b627986344c4ffa532c3e89186b
  F ext/fts5/fts5_tcl.c b1445cbe69908c411df8084a10b2485500ac70a9c747cdc8cda175a3da59d8ae
  F ext/fts5/fts5_test_mi.c 08c11ec968148d4cb4119d96d819f8c1f329812c568bac3684f5464be177d3ee
  F ext/fts5/fts5_test_tok.c a2bed8edb25f6432e8cdb62aad5916935c19dba8dac2b8324950cfff397e25ff
@@@ -2044,8 -2043,8 +2044,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 cc694b83408ccb5d42204cb624145c76e95329cbe1d1fe8815c70a7a00af231a
- R e5c49e6a91d60244d934bac112d65223
 -P 984d491eb3fe06f714bf07d6873321f3992a072812b46508e599bfefd39dff3e
 -R b5dbc1b2e0f8c0b371198b0b049fe385
++P d928856a226fb7f001e55ff7e8eb58a656b982f1efa811de46c382b8b7cd778c def41225b2f10b0294ab506f28bc87873688d4030f7056839298ff18e058ece5
++R 9340fb85125cf56624b0a9d4f0a2c56f
  U dan
- Z 153b54340cf10dbebadd96c0477be869
 -Z 503789c5124758a0ebc4d5ce1274a009
++Z f5189abe425e3b17c98ece46e03fa113
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 6b9ee4a956a6da0617241591308db80c6ab61c8b,a328a9f64607ce8674b6c27f0ee37dd765936d3b..bfa7824d4ad5d588f120ffd0e4137544791784fb
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d928856a226fb7f001e55ff7e8eb58a656b982f1efa811de46c382b8b7cd778c
 -def41225b2f10b0294ab506f28bc87873688d4030f7056839298ff18e058ece5
++5f66eb4e2603278dcc9dbfe4bf506cba1aa03180cfb492a0dfc3a8be32cc994b