From: dan <Dan Kennedy>
Date: Mon, 14 Jul 2025 18:03:23 +0000 (+0000)
Subject: Merge latest trunk changes into this branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d74e28504610f2936dfad8ad52002cb1dac910b0;p=thirdparty%2Fsqlite.git

Merge latest trunk changes into this branch.

FossilOrigin-Name: 8f9d6acaf7e15ca593da466ee83e88da9b718f17579ae8626040f28f071aeb18
---

d74e28504610f2936dfad8ad52002cb1dac910b0
diff --cc manifest
index 3ee146b9cc,4d685ee4f3..60bd88585a
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Experimental\schange\sto\sallow\svirtual\stable\sxBestIndex()\smethods\sto\sspecify\san\sinitial\ssetup\scost\sfor\sa\splan.
- D 2025-07-12T16:35:54.980
 -C Enhance\sthe\s"mktoolzip.tcl"\sscript\s(used\sby\sthe\s"tool-zip"\smakefile\starget)\sso\sthat\nit\suses\s"fossil\stest-filezip"\sto\sbuild\sthe\sZIP\sarchive\sif\savailable,\sand\sso\sthat\nit\salso\sgenerates\swindows-dll-*.zip\son\sWindows\splatforms.
 -D 2025-07-14T16:05:59.333
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2025-07-14T18:03:23.184
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -787,10 -788,10 +788,10 @@@ F src/resolve.c d3ee7ed308d46f4ee6d3bb6
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
  F src/select.c fc003cad96a105765261f7b6c5f4596e505894262bb5593cb29e10b682800d12
  F src/shell.c.in 73c0eeb7c265d59b99219d5aa055f412f07842088d8036b6d259927d85dd1bbf
 -F src/sqlite.h.in 5c54f2461a1ea529bab8499148a2b238e2d4bb571d59e8ea5322d0c190abb693
 +F src/sqlite.h.in 1164b84f4cd0e9bcc78beafb7057e671bf88e91f1ec69b90dd915e3dbe1ee7ca
  F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
  F src/sqlite3ext.h 0bfd049bb2088cc44c2ad54f2079d1c6e43091a4e1ce8868779b75f6c1484f1e
- F src/sqliteInt.h 9c99d7565a839ad342cdda504c4b7921bb1a24c07227b8f50b7b131245a20693
+ F src/sqliteInt.h 984e80f6cfdb1cd65ab465d14d82b6b56af4f7dc308c4bc1da85074a5b4ca755
  F src/sqliteLimit.h 6d817c28a8f19af95e6f4921933b7fbbca48a962bce0eb0ec81e8bb3ef38e68b
  F src/status.c 0e72e4f6be6ccfde2488eb63210297e75f569f3ce9920f6c3d77590ec6ce5ffd
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -2213,11 -2213,8 +2214,8 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P e5d079549594ca44852773b8919894866394e47ad725dadc7f65242413a219d3
- R 80db240348dc2c230f228c85bb783dc6
- T *branch * vtab-setup-cost
- T *sym-vtab-setup-cost *
- T -sym-trunk *
 -P 3c0afda372cd688e9aff7be1c0a41f557c8c8819f5f47420166ce8255cd806c8
 -R e290ca399c8e663ed9c1c500434c64ea
 -U drh
 -Z 55552671916a227c18ab9a99dcc87aef
++P b67babf1ab44ff13aea5c644e03da7cbcd16b9f6b840375e41fe483261681b7c 63ddc215eb6106985c53d3c8d99f5445a92acf4359a6bb2681882c49583df871
++R 213e35af82c50282a7078971b7210637
 +U dan
- Z 3e373c708a4d61112b8786e118f652a6
++Z 561cee1843624b72af8850fd14292987
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 0f03a6c95f,b83975833f..f0b5c9d4bd
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b67babf1ab44ff13aea5c644e03da7cbcd16b9f6b840375e41fe483261681b7c
 -63ddc215eb6106985c53d3c8d99f5445a92acf4359a6bb2681882c49583df871
++8f9d6acaf7e15ca593da466ee83e88da9b718f17579ae8626040f28f071aeb18