]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge trunk into tcl-cw branch. tcl-cw
authorstephan <stephan@noemail.net>
Fri, 30 May 2025 16:22:39 +0000 (16:22 +0000)
committerstephan <stephan@noemail.net>
Fri, 30 May 2025 16:22:39 +0000 (16:22 +0000)
FossilOrigin-Name: 6747183c90ca23f874921060ead48528d17dee87d64e027754620468d33ca6fe

1  2 
manifest
manifest.uuid
src/tclsqlite.c

diff --cc manifest
index ebc5126a36f4ba0ebbf14aef62c1624403742c37,67810fc4351f4c2af6b976807fb5adc7262efc4a..17b71a23fa0480e0e7e66c5cc795ac33278a81b1
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\strunk\sinto\sthis\sbranch.
- D 2025-05-17T17:15:49.390
 -C Configure-related\sfixes\sand\sadditions,\smost\snotably\sintegration\sof\sself-tests\sfor\sproj.tcl's\sAPIs.\sTeaish\smake-install\sfixes\sbased\son\sthe\sdiscussion\sin\s[forum:87e6660191a472c5\s|\sforum\sthread\s87e6660191a472c5].
 -D 2025-05-30T16:08:31.088
++C Merge\strunk\sinto\stcl-cw\sbranch.
++D 2025-05-30T16:22:39.186
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -794,7 -794,7 +794,7 @@@ F src/sqliteInt.h bb9137b860b2416b12788
  F src/sqliteLimit.h 6d817c28a8f19af95e6f4921933b7fbbca48a962bce0eb0ec81e8bb3ef38e68b
  F src/status.c 0e72e4f6be6ccfde2488eb63210297e75f569f3ce9920f6c3d77590ec6ce5ffd
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
- F src/tclsqlite.c 661032a24b661216d9a53393c71a079834d72d57bc663800991cf6f6e20aba59
 -F src/tclsqlite.c d0e63ffe7944dd223bf62066d9f982cbee1978811c7fbfd889f4ba9c5baed3d1
++F src/tclsqlite.c 117dd0569135dd87f2a89da99f5b9515715997b3e773e6ddedf50d9b972235cc
  F src/tclsqlite.h 65e2c761446e1c9fa0342b7d2612a703483643c8b6a316d12a65b745a4727395
  F src/test1.c 9b54135e5f1352f06b1d23d7c183f124c1f33de6ea8997cd801f0f215c43591d
  F src/test2.c 62f0830958f9075692c29c6de51b495ae8969e1bef85f239ffcd9ba5fb44a5ff
@@@ -2205,10 -2205,10 +2205,10 @@@ F tool/vdbe-compress.tcl fa2f37ab39b2a0
  F tool/vdbe_profile.tcl 3ac5a4a9449f4baf77059358ea050db3e34395ccf59c5464d29b91746d5b961e
  F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd72273503ae7d5
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
- F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
+ F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 46b0bf5603251748bbb48451d6a80f8e0596f5eff3ff62cebba0060cec6cdbe8 381d3e82e831bedee56108fb585880d802c4d7d50b0804d909a33ff15a3be185
- R 8f6311457ff6a65c71b83fedadd1a4de
 -P f63608a3847469b130e029cc569fe6f03a9053352ec43c10d69849cbab4f61c5
 -R 45ee8fcc96567a1f284bf3c5475d67ce
++P 58dd6d94e5c62e649ef89fdf363759bf329f6a8fd882dbf8f543ea7b26eb77c8 2e486f8fd011d28fdd7e59ff34f7f04374019932eb160a8c4de56a5ce01e5782
++R 7e6674f4a397b5ac7e1194a3b0e4cb2c
  U stephan
- Z 7aa091f3d2a44c39fddb4453372d06f2
 -Z 1517f3bde51bc97155127eadd67c114a
++Z a99f4a0af9ac938c0c5bf27c973ffe22
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 7cf97ae905957a3906400a09d689d18d331abdf0,f3a66759ea5806c754ba426f71f31eaef06de80c..3bfb1ca8774d0d295d56821c46f9c97dc51d48e6
@@@ -1,1 -1,1 +1,1 @@@
- 58dd6d94e5c62e649ef89fdf363759bf329f6a8fd882dbf8f543ea7b26eb77c8
 -2e486f8fd011d28fdd7e59ff34f7f04374019932eb160a8c4de56a5ce01e5782
++6747183c90ca23f874921060ead48528d17dee87d64e027754620468d33ca6fe
diff --cc src/tclsqlite.c
Simple merge