]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Update the bedrock branch to version 3.50.0
authordrh <>
Thu, 29 May 2025 14:59:34 +0000 (14:59 +0000)
committerdrh <>
Thu, 29 May 2025 14:59:34 +0000 (14:59 +0000)
FossilOrigin-Name: 54b8888080d99a8735ce11bb994e253a6406e42d4e34a7a4e5af566cf6841c8b

1  2 
ext/session/sqlite3session.c
ext/session/test_session.c
main.mk
manifest
manifest.uuid

Simple merge
Simple merge
diff --cc main.mk
Simple merge
diff --cc manifest
index 9c9503d408099209dd08a7d14b0e108ad0a65906,24554ed27a0f29b4d7bba8db7d6f80ec1b217425..6f23464a231cbaf525a0804c2db3c81c0ebd3902
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sbedrock\sbranch\sthrough\sthe\nwal2\sintermediary.
- D 2025-05-19T16:58:50.750
 -C Bring\sthe\swal2\sbranch\sto\sto\sversion\s3.50.0.
 -D 2025-05-29T14:47:35.901
++C Update\sthe\sbedrock\sbranch\sto\sversion\s3.50.0
++D 2025-05-29T14:59:34.795
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -623,11 -619,9 +623,11 @@@ 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 6b0877fe1ab832aa4b85eaca72606dfd1630a1363a1be7af10ee1042a5ec719e
 -F ext/session/sqlite3session.h 9bb1a6687b467764b35178dc29bbd2c57ab8cd3acdc8a62f088c34ad17e4fe2b
 -F ext/session/test_session.c 2ddff73ea368d827028c32851b291416e1008845832feb27b751d15e57e13cc3
 +F ext/session/sqlite3changebatch.c d488b42d8fd49fb013a1e9c4535232680dabeb28ae8f9421b65ea0ccc3b430f7
 +F ext/session/sqlite3changebatch.h e72016998c9a22d439ddfd547b69e1ebac810c24
- F ext/session/sqlite3session.c de164f24dafd22d687dbe9e1e3492d19b1e782dda3488d02eb12521242016a9a
++F ext/session/sqlite3session.c a940cac8207867d6fd2db60f915156b1bf6f6e6a1a22962d88a7a52a732ddad8
 +F ext/session/sqlite3session.h 88452570259cd8c9a60630d628e1d7c9f1593ddb72a0c18b55fb77d91fd5ffff
- F ext/session/test_session.c 6fb82bec8157f8d802f69a8d599581edf08e27972afcdfe4c2e43223add503fe
++F ext/session/test_session.c f89ae37fcf522abf8012e50d5dba487d3635561f62294a65d5de40b67ca04833
  F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
  F ext/wasm/GNUmakefile 24d7e6f446528fa67f5ade6c3c7d7e46e1ac52649d6264cbe24539c1dab608e1
  F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a
@@@ -717,7 -711,7 +717,7 @@@ F ext/wasm/tests/opfs/sahpool/sahpool-p
  F ext/wasm/tests/opfs/sahpool/sahpool-worker.js bd25a43fc2ab2d1bafd8f2854ad3943ef673f7c3be03e95ecf1612ff6e8e2a61
  F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702
  F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
- F main.mk f4c9acc5fa11e1c1d2f7ef29bb2bdf3df14f28ffbdc7da4928f7034a489c9282
 -F main.mk f1f80f53a95db41e4b1680785f5b866790236d93d557da67c1c45dda93b92154
++F main.mk 18765a6038a301341706d8024edc04220098c037b774fc8714049156376444df
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
  F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@@ -754,10 -748,10 +754,10 @@@ F src/hash.h 46b92795a95bfefb210f52f0c3
  F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
  F src/insert.c d05934dfab2c5c0c480fc6fd2038f11215661de08ea6ff38d2563216bd555c1b
- F src/json.c 2406a6b0dd849ee0fd107d5cfef9fec2cdc2fbe631ece3183c31d6f85e0ec988
+ F src/json.c d34969ecb9555f33fc0b2227628189a9a4e20dda5df5d173db9918a014aa7ad1
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c d7edd8e671237539d795d30daaf888908a2c82e99bade4c78f3be021e8b7d655
 -F src/main.c 07f78d917ffcdf327982840cfd8e855fd000527a2ea5ace372ce4febcbd0bf97
 +F src/main.c 7d096f4d0be67a2e35ad976d2773cff832947a0cefba42ef48762abdf5f7f4b9
  F src/malloc.c 410e570b30c26cc36e3372577df50f7a96ee3eed5b2b161c6b6b48773c650c5e
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2
@@@ -802,9 -796,9 +802,9 @@@ F src/sqliteInt.h 4908ecc28e861355021f7
  F src/sqliteLimit.h 6d817c28a8f19af95e6f4921933b7fbbca48a962bce0eb0ec81e8bb3ef38e68b
  F src/status.c 0e72e4f6be6ccfde2488eb63210297e75f569f3ce9920f6c3d77590ec6ce5ffd
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
- F src/tclsqlite.c 767a11d470b031e85f51b8924a0e8929b2362ff1975aee3474a10eba3c2e0d36
+ F src/tclsqlite.c d0e63ffe7944dd223bf62066d9f982cbee1978811c7fbfd889f4ba9c5baed3d1
  F src/tclsqlite.h 65e2c761446e1c9fa0342b7d2612a703483643c8b6a316d12a65b745a4727395
 -F src/test1.c 9b54135e5f1352f06b1d23d7c183f124c1f33de6ea8997cd801f0f215c43591d
 +F src/test1.c 0ada8ee89542da39871cc93e41e33068235eaa24856ee580cc6c83786835ffd8
  F src/test2.c 62f0830958f9075692c29c6de51b495ae8969e1bef85f239ffcd9ba5fb44a5ff
  F src/test3.c 432646f581d8af1bb495e58fc98234380250954f5d5535e507fc785eccc3987a
  F src/test4.c 0ac87fc13cdb334ab3a71823f99b6c32a6bebe5d603cd6a71d84c823d43a25a0
@@@ -874,10 -868,10 +874,10 @@@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1
  F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3
  F src/vtab.c 828221bdbeaaa6d62126ee6d07fd4ec0d09dcaea846f87ad01944d8b7e548859
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 40492478a4bb0cc5de0f365b18a50fef6751aff36aa005959b7abcf6176e2101
 -F src/wal.h 97b8a9903387401377b59507e86b93a148ef1ad4e5ce0f23659a12dcdce56af2
 +F src/wal.c a9b11c8646311aa9283ff071d99f8bbd6fac5d97e12f1acd86976715287c63aa
 +F src/wal.h 8d02ab8c2a93a941f5898eb3345bf711c1d3f8f86f4be8d5428fb6c074962d8a
  F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014
- F src/where.c 1d06561f7310af61bef8a046fa95d463ad88f855be9036fec9091f984520afc5
+ F src/where.c 45a3b496248a0b36d91ce34da3278d54f8fa20e9d3fbd36d45a42051d1118137
  F src/whereInt.h ecdbfb5551cf394f04ec7f0bc7ad963146d80eee3071405ac29aa84950128b8e
  F src/wherecode.c 8825756ea7b1a49ac830719d28557c638520bb2434fe9c2dd6c7f584034bfe32
  F src/whereexpr.c 2415c8eee5ff89a8b709d7d83d71c1ff986cd720d0520057e1d8a5371339012a
@@@ -2244,8 -2221,8 +2244,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 9d6517e7cc8bf175fa189348c7938425aa8322ec1824191b2287f8979b45cd56 720d175478e05921d97c561ca6883d0531188804009f388954fdb54642dec1e5
- R 5723670f09d8ec733119c02e2a95d333
 -P 720d175478e05921d97c561ca6883d0531188804009f388954fdb54642dec1e5 dfc790f998f450d9c35e3ba1c8c89c17466cb559f87b0239e4aab9d34e28f742
 -R 556a99cb8a95426908585d76af7dc839
++P e7d6e993df772ca390186188c4b844a08402111cbc06bae9c731ebd3283da1c1 9f9f81ca9cbd24ac48cda7d5bd6ecea1e5c55aa40611b926715d1c79d80197e4
++R eddb35aa7f8401812f217f1c8c89cfa1
  U drh
- Z e4fad8dff4e30571e493ae3f455df573
 -Z 4c3f50e73bb3c0ef662d76dcde0a442d
++Z e14953c603f8441aeeb49b7115a932d4
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 60394895c44ce7776ab5f66b907b378df7f2a2e2,6b96640e3b084380b29d4c16f59347fbd6cda563..ee4886dbc1acb9b9c64070bc9e142208003dc669
@@@ -1,1 -1,1 +1,1 @@@
- e7d6e993df772ca390186188c4b844a08402111cbc06bae9c731ebd3283da1c1
 -9f9f81ca9cbd24ac48cda7d5bd6ecea1e5c55aa40611b926715d1c79d80197e4
++54b8888080d99a8735ce11bb994e253a6406e42d4e34a7a4e5af566cf6841c8b