]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge in trunk for continued work on this branch.
authorstephan <stephan@noemail.net>
Mon, 29 Jun 2026 11:22:40 +0000 (11:22 +0000)
committerstephan <stephan@noemail.net>
Mon, 29 Jun 2026 11:22:40 +0000 (11:22 +0000)
FossilOrigin-Name: 14bdec7494757679e7d828ad092546db486a62776d06a9b7799dac50f107e10d

1  2 
manifest
manifest.uuid

diff --cc manifest
index f329f80c9a9c9cd46a4859edf5f0382fa69231a6,841ae9f46d5840f15a8ca558a48e080fda7780f1..15d010d0a675e587b6bc967b0161dc697e467d19
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\svtab\sto\sthe\slist\sof\ssupported\somit-api=X\soptions\sand\steach\stester1\sto\sgracefully\shandle\sthat.
- D 2026-06-24T09:32:55.569
 -C Mark\sshadow\stables\swhen\sregistering\sa\snew\svirtual\stable\sthat\salready\sexists\nafter\sthe\sschema\shas\sloaded.\s\sTest\scases\sin\sTH3.\n[bugs:/info/2026-06-26T12:45:51Z|Bug\s2026-06-26T12:45:51Z].
 -D 2026-06-28T19:05:29.919
++C Merge\sin\strunk\sfor\scontinued\swork\son\sthis\sbranch.
++D 2026-06-29T11:22:40.737
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -574,10 -576,10 +576,10 @@@ 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 ce9f2ce2cc6b17f46854788e47016ba9be1b59ca4037728b6c025397b98edb12
+ F ext/session/sqlite3session.c f609882f830bf5e533112ed1ef9b888fa75670175fca810d6b6e48ca6395b15b
  F ext/session/sqlite3session.h ca7c4422c1514a95056cc8d333217df6b1829d39058126b1de85d10cd62d7a9c
  F ext/session/test_session.c d3275da24b8d362e3c2b393c00d5248f75f1cd474dadf29d8c4683f75cb52e6d
 -F ext/wasm/GNUmakefile 1d76d4017ed0b7bd2a8cc079c437cd09d20a0f0fb99f488d2466703c38409cb2
 +F ext/wasm/GNUmakefile b99469147698d6255a925bee0249945ce17c6bf19aa88913671c7425fe781e5c
  F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a
  F ext/wasm/README.md 2e87804e12c98f1d194b7a06162a88441d33bb443efcfe00dc6565a780d2f259
  F ext/wasm/SQLTester/GNUmakefile e0794f676d55819951bbfae45cc5e8d7818dc460492dc317ce7f0d2eca15caff
@@@ -2208,8 -2210,8 +2210,8 @@@ F tool/warnings-clang.sh bbf6a1e685e534
  F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
  F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
- P c65153b28f8a7fcf5eec96032b4f030e6f698ed7d5c1ab479462b4e36ab89c55
- R ab66a66f5837b6e280dbf5e19213306c
 -P b5af1a5c7fc8c84e077eb3aa23fbb8712fcaf5143c228db4042f3d811fa6beaf
 -R 3eb1b598f9b12592279a05927c62035b
 -U drh
 -Z 2093212e730828c30bc09ce27259a526
++P e4a350e6846f35c4b7b1501d702f4d8337cbf285df8c37416e8db5a7dba5b6f0 3e80958a7052a123f4599d64baa8cc31a761e5a58d04c75ca38f2a375d247808
++R 74c633c5bbf8a4ebccd4209da83213d5
 +U stephan
- Z 03cb1fbd950d22192ccad5a52980f4f4
++Z 8cc3734dbb4d2b214b62818e74d4dfb9
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index e2e0a3a9586f19b34aa02f1648ec1ff61726c95e,37204d3f0dd7fb5d5e0a328a53a689dfa7eb0584..e5cfab0199cb2f16d38baee38040dee246008716
@@@ -1,1 -1,1 +1,1 @@@
- e4a350e6846f35c4b7b1501d702f4d8337cbf285df8c37416e8db5a7dba5b6f0
 -3e80958a7052a123f4599d64baa8cc31a761e5a58d04c75ca38f2a375d247808
++14bdec7494757679e7d828ad092546db486a62776d06a9b7799dac50f107e10d