]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge all the latest trunk enhancements into the begin-concurrent branch.
authordrh <>
Tue, 6 May 2025 21:26:10 +0000 (21:26 +0000)
committerdrh <>
Tue, 6 May 2025 21:26:10 +0000 (21:26 +0000)
FossilOrigin-Name: 55a51ba58f98cbec9b0be444a3d5f839caba32576e8a5f6400b298de56e70006

1  2 
Makefile.msc
main.mk
manifest
manifest.uuid
src/build.c
src/vdbe.c
src/vdbeaux.c

diff --cc Makefile.msc
Simple merge
diff --cc main.mk
Simple merge
diff --cc manifest
index f7305ecff2e0c935cb2791d776b4146d651954c1,ffede026c3eb241be9eed0afb848e849f984f441..3415673e581a94daa67d8fcb7a70dc384e8e2458
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\sall\srecent\strunk\senhancements\sinto\sthe\sbegin-concurrent\sbranch.
- D 2025-04-21T12:41:38.252
 -C Add\stest\scases\sfor\sthe\sNOT\sNULL/IS\sNULL\soptimization\sin\sCHECK\sconstraints\sfix.
 -D 2025-05-06T17:56:32.330
++C Merge\sall\sthe\slatest\strunk\senhancements\sinto\sthe\sbegin-concurrent\sbranch.
++D 2025-05-06T21:26:10.230
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
  F Makefile.in c3e414df4dc8dfb12f1f6baf129fcb6d18cd0ebd3c9109370fb3fceeeef9a37a
  F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0
- F Makefile.msc 5f8e3054f9a704720159fbb3bf755e7f69b33033533215d2790ed727152fc7b6
 -F Makefile.msc 0206f28988bb6634c7e8aff05bf6cfa65d6dfe1d2b6bd95160dd99290a83dfc7
++F Makefile.msc 28d1537e8e21a5f264219da336fca1bce7517199a723572bbeb16ac79a7d1909
  F README.md e28077cfbef795e99c9c75ed95aa7257a1166709b562076441a8506ac421b7c1
  F VERSION 001dea55eb8304ec9130b6b44a32d3fc349f279d45a7e224fc0730c3cb8e2372
  F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
@@@ -714,7 -709,7 +714,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 19f3f36fc269fea1d04f17b50d072c0d969c5b99aa07cd41e5898276c8f9f0a3
 -F main.mk a41fa9e96ef139452d21a9ca5db4561ce053363e04d07da803f5e1cefb44c65e
++F main.mk 56b1a82cc618aa94f98938b5a1a16b5be79c13ebbfd4ba127329ad9c45015d7f
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
  F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@@ -729,32 -724,32 +729,32 @@@ F src/analyze.c 13895d4da6ac857d95d3291
  F src/attach.c 9af61b63b10ee702b1594ecd24fb8cea0839cfdb6addee52fba26fa879f5db9d
  F src/auth.c 54ab9c6c5803b47c0d45b76ce27eff22a03b4b1f767c5945a3a4eb13aa4c78dc
  F src/backup.c 5c97e8023aab1ce14a42387eb3ae00ba5a0644569e3476f38661fa6f824c3523
 -F src/bitvec.c 782cc29b42b47e7ec6348eb0aaf9ffe60063f498387e7249f458d445af4b53e9
 +F src/bitvec.c 93c1fb3e5d8fbfed7daacfc2210555ebbddb1b04efb12763b46189a76106e1c1
  F src/btmutex.c 30dada73a819a1ef5b7583786370dce1842e12e1ad941e4d05ac29695528daea
 -F src/btree.c 00fcee37947641f48d4b529d96143e74d056b7afa8f26d61292c90ee59c056b2
 -F src/btree.h 18e5e7b2124c23426a283523e5f31a4bff029131b795bb82391f9d2f3136fc50
 -F src/btreeInt.h 9c0f9ea5c9b5f4dcaea18111d43efe95f2ac276cd86d770dce10fd99ccc93886
 -F src/build.c 67c1db4c5e89a8519fe9b6dafc287f6bc3627696b5b8536dc5e06db570d8c05f
 +F src/btree.c 23f1baf6dc4db7c4acd0e729e9792f81e9297488eb23c0b494f6d8ee02f9f615
 +F src/btree.h 65b1b3e1d28c4e2f52a85aebdfb536508084cfe0f843fda3102cfdd4e23a209f
 +F src/btreeInt.h d802a3263b11c97f04f857e3f55aa58d0af611ed9fe8bebc7d661dfb62370045
- F src/build.c 225e7c10ff9047943df0edc609352fc9b0aefb404b9199b344c77e200da24054
++F src/build.c ec94615c47f30c4923046e90e4cdb707098b3c241ad90963470e10c6cdcfd6ae
  F src/callback.c acae8c8dddda41ee85cfdf19b926eefe830f371069f8aadca3aa39adf5b1c859
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/date.c 9db4d604e699a73e10b8e85a44db074a1f04c0591a77e2abfd77703f50dce1e9
  F src/dbpage.c fcb1aafe00872a8aff9a7aa0ef7ff1b01e5817ec7bbd521f8f3e1e674ac8d609
  F src/dbstat.c 73362c0df0f40ad5523a6f5501224959d0976757b511299bf892313e79d14f5c
  F src/delete.c 03a77ba20e54f0f42ebd8eddf15411ed6bdb06a2c472ac4b6b336521bf7cea42
- F src/expr.c 61c3baab38f1b50eb4696e1f37c8f7ae1d1ecbfc1a35d446cfd1886624784131
+ F src/expr.c 6f184da1f36576ad1ecc48a03f14774235373c64f88d462c710834930ee6c145
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c 928ed2517e8732113d2b9821aa37af639688d752f4ea9ac6e0e393d713eeb76f
 -F src/func.c 7686ea382b20e8bfe2ab9de76150c99ee7b6e83523561f3c7787e0f68cb435c2
 +F src/func.c c7f750bbf0ac3174fe280571d09ca1385b74bca7b1168f19c902fc65631959f7
  F src/global.c a19e4b1ca1335f560e9560e590fc13081e21f670643367f99cb9e8f9dc7d615b
  F src/hash.c 73934a7f7ab1cb110614a9388cb516893b0cf5b7b69e4fd1a0780ac4ce166be7
  F src/hash.h 46b92795a95bfefb210f52f0c316e9d7cdbcdd7e7fcfb0d8be796d3a5767cddf
  F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
  F src/insert.c d05934dfab2c5c0c480fc6fd2038f11215661de08ea6ff38d2563216bd555c1b
- F src/json.c d0e1c62a9689018fe5876b1a1eb574e4ab7a40e0928e0e5adda8b3860c70e1b8
+ F src/json.c c84b0f2bae967341d5a035808d21d0619b23b6e054ceac08e7592cd87f04ed4f
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 -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
@@@ -787,15 -782,15 +787,15 @@@ F src/pcache1.c 131ca0daf4e66b4608d2945
  F src/pragma.c 30b535d0a66348df844ee36f890617b4cf45e9a22dcbc47ec3ca92909c50aaf1
  F src/prepare.c 1832be043fce7d489959aae6f994c452d023914714c4d5457beaed51c0f3d126
  F src/printf.c 3b91c334f528359145f4dde0dedd945bbb21044d0825ea064934d7222d61662c
 -F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 +F src/random.c a3e70f8515721ff24d2c0e6afd83923e8faab5ab79ececea4c1bf9fe4049fbb2
  F src/resolve.c 20e1fbe8f840ffc0cd835e33f68a802a22e34faa918d7a269f3de242fda02f99
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 -F src/select.c 1a5956231f7c57571288eaad61e5c37aaf0f3acb5c8a5ea0b896938166b62fa2
 +F src/select.c 87db7dddd54fae439c1111d5593e43c690d3a7a23d265d466d3baec8b4c912f4
- F src/shell.c.in 1e8b9bf369e80cdf9b029142e773038bc12bd38aea1c56df4af6bf7b46cae955
+ F src/shell.c.in 2c904da4431fed365e7d5029b8cb2da46cb3e8cf8a09305d1478836a2301ea96
 -F src/sqlite.h.in 22882ddd3a70751aa8864c81993ee4562ed54c2c508b6270f75e223ffee38e1b
 +F src/sqlite.h.in 465d4d97e9df39085b111d9683fafdc07b36e401ec023ac2d94ef6eedb5d773f
  F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
  F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
 -F src/sqliteInt.h 8b18ed676757ce49df633b603a465655aa105d9862821ffa9296afb189ba564f
 +F src/sqliteInt.h e02200b1ccdc90e4ee4d4c7db478c4cf3371cefa430f20cf7ebfe4d424cf320d
  F src/sqliteLimit.h 6d817c28a8f19af95e6f4921933b7fbbca48a962bce0eb0ec81e8bb3ef38e68b
  F src/status.c 0e72e4f6be6ccfde2488eb63210297e75f569f3ce9920f6c3d77590ec6ce5ffd
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -858,12 -853,12 +858,12 @@@ F src/update.c b370610139b1a568bda5b1e5
  F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1
  F src/utf.c 3a20cbae9688af4c1e3754cc2520189d00762e37f60c2deb0b303360d166bba6
  F src/util.c 36fb1150062957280777655976f3f9a75db236cb8207a0770ceae8d5ec17fcd3
 -F src/vacuum.c d580ceb395c1ae3d59da41cbfea60683ff7dd2b94ddf4d0f5657620159e2eeb7
 -F src/vdbe.c 0feab5781141acca67bd5de84172fff902304274ec5cfe58609f005b8d160050
 +F src/vacuum.c d19f42d5ee6e45fbb6a54f943da186ba1bbf43304a47b886597f24f309c16993
- F src/vdbe.c f0e780c1a2bd84a189dba7119d45e66a36c0777c2378874d274424f8d07c46e0
++F src/vdbe.c befeb6ebd2fdb8637f74caab947879c217e512a0f823b40eba73648daf2fad9f
  F src/vdbe.h 31eddcffc1d14c76c2a20fe4e137e1ee43d44f370896fae14a067052801a3625
  F src/vdbeInt.h 5446f60e89b2aa7cdf3ab0ec4e7b01b8732cd9d52d9092a0b8b1bf700768f784
  F src/vdbeapi.c 28fab30ed0acc981aecfdcaab0a421503609078e29850eb28494816682baf0a7
- F src/vdbeaux.c 92f0ba10857c7995f513de92ce9e24b24e13b0a5ff8a8e5b352fe5bbb6aa10f2
 -F src/vdbeaux.c 948c379976885a073b54cc7d8ffda087dc1a1095d1f5bb8df218796f8c933ac3
++F src/vdbeaux.c 9ed33df70e90011effd9112bb3e292c5721d6a282d77cb8cb62e297465d0d57b
  F src/vdbeblob.c b1b4032cac46b41e44b957c4d00aee9851f862dfd85ecb68116ba49884b03dfd
  F src/vdbemem.c e67d9c6484d868c879d20c70d00bf4a9058082f1d4058607ca15d50eb3aebc21
  F src/vdbesort.c 49e366d0216c782eba287bf602384e4330d2526a22f1275492d2785ce103c79b
@@@ -2177,10 -2159,9 +2176,9 @@@ F tool/mkmsvcmin.tcl d76c45efda1cce2d40
  F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef
  F tool/mkopcodeh.tcl 2b4e6967a670ef21bf53a164964c35c6163277d002a4c6f56fa231d68c88d023
  F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
 -F tool/mkpragmatab.tcl 3801ce32f8c55fe63a3b279f231fb26c2c1a2ea9a09d2dd599239d87a609acec
 +F tool/mkpragmatab.tcl 10694206dfe9d1f6e24d5876d52bb56e67706ef20bc479002bb88b67b90be045
  F tool/mkshellc.tcl 9ce74de0fa904a2c56a96f8d8b5261246bacb0eaa8d7e184f9e18ff94145ebbc
  F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
- F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 351c55256213154cabb051a3c870ef9f4487de905015141ae50dc7578a901b84
  F tool/mksqlite3c.tcl f11b63445c4840509248bd4aa151a81aea25d5415fef71943c8d436eba4f3b3c
  F tool/mksqlite3h.tcl 989948c6a26e188e673d7c2f2f093ea3acd816ad6ac65bab596280075c8f3a45
@@@ -2233,8 -2207,8 +2224,8 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P cb5e024b6aed12cb109b481e87d2a5457b5f4f5fc090571e5eef2bd8cf04aaf7 ea9acb5573f4d71a314e4467d30477a1d01c8db648985750a42b3c047f404c9c
- R 814f0ad147cb1263ebf160fcb9250e9b
 -P 2adaee9aa90f280a406007695fbc4a314806584c93d6b62b46c031492b31ec27
 -R 785918686456a4e780990cb7c7171f36
 -U dan
 -Z bab07d1fb4803bf298a1c8473b03d461
++P 2866119c755a4ebc1f3670709de153fc1abd7bbd77c4467123d2aed478143a92 6eb2939a6093c0796910645172d80c53055559dd57c012f1dc815d89fbf84447
++R d460727925889a6b0ac7ed0195e9dc76
 +U drh
- Z fe206765665175d365be16b182d584ba
++Z 6fec4ad9c5ffd3d6d5e0d8e03d6a7dc2
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 980bb76c8e837776a85e37c506ddd0082ffc6cc9,dc7c0bb9b5473c46ce5b9dbb2e15018e8c6447dc..a2ffe18f4b8f8ad0cbdb7e23b23a6e6a6a027d6c
@@@ -1,1 -1,1 +1,1 @@@
- 2866119c755a4ebc1f3670709de153fc1abd7bbd77c4467123d2aed478143a92
 -6eb2939a6093c0796910645172d80c53055559dd57c012f1dc815d89fbf84447
++55a51ba58f98cbec9b0be444a3d5f839caba32576e8a5f6400b298de56e70006
diff --cc src/build.c
Simple merge
diff --cc src/vdbe.c
Simple merge
diff --cc src/vdbeaux.c
Simple merge