]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge trunk with this branch.
authordan <Dan Kennedy>
Tue, 11 Nov 2025 17:06:24 +0000 (17:06 +0000)
committerdan <Dan Kennedy>
Tue, 11 Nov 2025 17:06:24 +0000 (17:06 +0000)
FossilOrigin-Name: d7d8d08f849b2caeef4f18244c4b594e4f66506ef00be47ab2dd4b53d3ab98e8

1  2 
manifest
manifest.uuid

diff --cc manifest
index 61405b27f5b292b31fb52bddb7a76f8646147d67,c1e7a6cf86ff1a11410ebd6088f883e764ec5da8..7e4c16a5d206187ef7981a5bf829245527fdf04d
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
- D 2025-11-07T19:23:06.789
 -C Improved\sconcurrency\sfor\s"make\sdevtest"\sby\ssplitting\sfuzzdata1.db\sand\nfuzzdata2.db\sinto\sslices\sfor\sasan\sand\subsan\stesting.
 -D 2025-11-10T20:01:39.258
++C Merge\strunk\swith\sthis\sbranch.
++D 2025-11-11T17:06:24.382
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -732,11 -732,11 +732,11 @@@ F src/random.c 606b00941a1d7dd09c381d32
  F src/resolve.c 5616fbcf3b833c7c705b24371828215ad0925d0c0073216c4f153348d5753f0a
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
  F src/select.c ba9cd07ffa3277883c1986085f6ddc4320f4d35d5f212ab58df79a7ecc1a576a
- F src/shell.c.in 265015aaec4580a0bef50ff570ec8d2813498ee49dcfdf9757e76f3b2a59fc97
- F src/sqlite.h.in 43f60117ce68847b9d4e7fa43c2ac42bb324185e66b924d3114b24d4037fc263
+ F src/shell.c.in ceb0a9cc008ac82d8d2e6ef353db14a54bc40dfd60a8cfbb6bc98d071f538761
+ F src/sqlite.h.in 7403a952a8f1239de7525b73c4e3a0f9540ec0607ed24fec887f5832642d44b8
  F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
  F src/sqlite3ext.h 7f236ca1b175ffe03316d974ef57df79b3938466c28d2f95caef5e08c57f3a52
 -F src/sqliteInt.h 88f7fc9ce1630d9a5f7e0a8e1f3287cdc63882fba985c18e7eee1b9f457f59aa
 +F src/sqliteInt.h 2d4f0313931bdfab8667bc1221b0dde6aa5b983662e27b76b3f88a7c209a9932
  F src/sqliteLimit.h fe70bd8983e5d317a264f2ea97473b359faf3ebb0827877a76813f5cf0cdc364
  F src/status.c 7565d63a79aa2f326339a24a0461a60096d0bd2bce711fefb50b5c89335f3592
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -2169,8 -2167,8 +2169,8 @@@ F tool/version-info.c 33d0390ef484b3b1c
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 963a4c406799fc5352157552bdbbc6a0cc7edf68040e893e9d736ab7224d5a4b 620434a4a276ecaf2ee56d325815ac4e33c95e1190b420a341e376e54ef60278
- R 31ba4ae768761466c74f58e4a871eb91
 -P 45d820ca227eb1ade4dda498b0f94b2c5df4bab3fc5fcdd517ee125a43d16f4d
 -R c02353342359a64f90fec87b4fb2bd13
 -U drh
 -Z 0c51bc37cf181ef87235fa1f14598ce5
++P c0571f0010f3a6311fa99cf1b37a8e5ee39a9b8e27313cde5ea4bd1701bf2f93 2c31176607f02a73cf2626cda2dd0711ae74bdf0b4520d4c84ff299c860e419e
++R 5ec79cfe2fccb1a31d5545e44a26a12b
 +U dan
- Z 392123637a7c7c1dce4c2693ad567a08
++Z 411fb92e098a02eb7bc0999feaf98e6b
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 24b45d244f5f7e7ac1b1c4faba534682323f6ddd,2b5210b277c8b9c882f85a6bb0e681a134c0d104..2c07929d79c70a5316766a84cb1cd28c8e6ca910
@@@ -1,1 -1,1 +1,1 @@@
- c0571f0010f3a6311fa99cf1b37a8e5ee39a9b8e27313cde5ea4bd1701bf2f93
 -2c31176607f02a73cf2626cda2dd0711ae74bdf0b4520d4c84ff299c860e419e
++d7d8d08f849b2caeef4f18244c4b594e4f66506ef00be47ab2dd4b53d3ab98e8