]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge latest trunk changes into this branch.
authordan <Dan Kennedy>
Wed, 14 Jan 2026 16:01:28 +0000 (16:01 +0000)
committerdan <Dan Kennedy>
Wed, 14 Jan 2026 16:01:28 +0000 (16:01 +0000)
FossilOrigin-Name: fae9f376b74ae688dbdb5c0838a38427258d3d14c29c5346a3549e56db79961a

1  2 
ext/session/sqlite3session.c
manifest
manifest.uuid

Simple merge
diff --cc manifest
index c093bdcad2b35e20403c5c832691e8ace29c77ec,209ed95f43fd393b73947a2139a685661eac9003..acfd050ffdd08c64e406669638df258efdf3ba78
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\stests\sfor\sedge\scases\sin\sthe\snew\scode\son\sthis\sbranch.
- D 2026-01-14T15:27:26.954
 -C Guard\sagainst\soversized\sindex\sentries\sin\sdatabases\slarger\sthan\s2GiB.
 -D 2026-01-14T13:43:32.416
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2026-01-14T16:01:28.703
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -578,9 -577,9 +578,9 @@@ F ext/session/sessionrowid.test 85187c2
  F ext/session/sessionsize.test 8fcf4685993c3dbaa46a24183940ab9f5aa9ed0d23e5fb63bfffbdb56134b795
  F ext/session/sessionstat1.test 5e718d5888c0c49bbb33a7a4f816366db85f59f6a4f97544a806421b85dc2dec
  F ext/session/sessionwor.test 6fd9a2256442cebde5b2284936ae9e0d54bde692d0f5fd009ecef8511f4cf3fc
- F ext/session/sqlite3session.c 16c36e63d41e2d0f6a8d4593618f221185064ab01d49b8514cb5e710642bdb67
 -F ext/session/sqlite3session.c 203b3778367733d95c06c5f10965ce66d6448df93ece107cb93dc3fdf0f4f26c
 -F ext/session/sqlite3session.h 7404723606074fcb2afdc6b72c206072cdb2b7d8ba097ca1559174a80bc26f7a
 -F ext/session/test_session.c 8766b5973a6323934cb51248f621c3dc87ad2a98f023c3cc280d79e7d78d36fb
++F ext/session/sqlite3session.c cad71a74f104fcdfc8eefaf544ea29f54c46a9a4d1a095b40d04824aa606f74a
 +F ext/session/sqlite3session.h cb6d25b573751afd9668f9ae8f1c7819df30916f43cc4c06b57749a6c2ce3e10
 +F ext/session/test_session.c dae76c3da7eb51bc500451a37d23382f0d63f169927c5a26aee1db5a7dd6d91a
  F ext/wasm/GNUmakefile c3d007dd181527283d8674c812cc60518353f1f69c9a9d3008f10f53cea4a3c1
  F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a
  F ext/wasm/README.md 2e87804e12c98f1d194b7a06162a88441d33bb443efcfe00dc6565a780d2f259
@@@ -2192,8 -2191,8 +2192,8 @@@ F tool/warnings-clang.sh bbf6a1e685e534
  F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
  F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
- P 8699fe5b24c8aeb5e552aa7f4995f2b50dd33d1febd23ec1c07c8fc72497da72
- R 05ca11675af54a626e0a105c1338dfe9
 -P 8e656a483557bc5385219d560b9155c232e7dc9d62642249abc879fb37bacd2a
 -R e4a21a4b0c8374195b8c7e4077a8aa5c
 -U drh
 -Z 3811ba8eb57fe99f7ac42f617514bf6f
++P cd115f0f4437bf254058e40d70ba4e82e87227d2752695aa18f8431c3abc5c0b ed17a878e5a2e0cd1e9b69d528f5ac2ba8452d7c83deaf3cc72ecbff054f5ca3
++R f8b5009cc483f181e78204d06b24b034
 +U dan
- Z f1ad619150ebc2af383c65f82ab9b53f
++Z fa614e954b104f0a1194ef8e1642c727
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index a7cf753e342eed5f8f3265e1c61d73784f601fc6,1b6d714e0cb7a569e906e6229714be8028df4aab..40aaf4dc5c9115f85dc99090754b3744482f445e
@@@ -1,1 -1,1 +1,1 @@@
- cd115f0f4437bf254058e40d70ba4e82e87227d2752695aa18f8431c3abc5c0b
 -ed17a878e5a2e0cd1e9b69d528f5ac2ba8452d7c83deaf3cc72ecbff054f5ca3
++fae9f376b74ae688dbdb5c0838a38427258d3d14c29c5346a3549e56db79961a