]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge the latest 3.44.0 changes into wal2 branch.
authordrh <>
Mon, 30 Oct 2023 21:46:46 +0000 (21:46 +0000)
committerdrh <>
Mon, 30 Oct 2023 21:46:46 +0000 (21:46 +0000)
FossilOrigin-Name: 4f65ae2df071d2064ff1494b918c1dee2147e174f79060cd031c25f1aff70a7e

1  2 
Makefile.in
Makefile.msc
main.mk
manifest
manifest.uuid
src/btree.c
src/pager.c
src/pragma.c
src/vdbe.c
src/vdbeaux.c

diff --cc Makefile.in
Simple merge
diff --cc Makefile.msc
Simple merge
diff --cc main.mk
Simple merge
diff --cc manifest
index 0e6a869b816a000c9aa8cd9d9ffcee682c77bee0,4c9859dc5cb843a4be4c235db3c6d7f7c67a4f06..d33d988041979d74b9f633a1b83bc0968779c1cd
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
- D 2023-10-23T16:00:26.119
 -C Update\sthe\sautoconf/Makefile.msc\sso\sthat\sit\saligns\swith\sMakefile.msc.
 -D 2023-10-30T20:35:33.577
++C Merge\sthe\slatest\s3.44.0\schanges\sinto\swal2\sbranch.
++D 2023-10-30T21:46:46.791
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in a41928183f9bf347dffa02bd6194ff97623d2797d1b1d8b99252e892a2a92b8e
 -F Makefile.in 8b59912fc1538f96a08555605c5886cdcc733696ae7f22e374b2a4752196ca20
++F Makefile.in ad192aadf9993b94f04497a89ee95703586702fbf19afbf265fabe87dd1fa19b
  F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
- F Makefile.msc 3930ee99c2ee2112c06f30dc64871741f944c0d72f472fb03bebb37d2378bb8b
 -F Makefile.msc 2309c96119271c76f25c5a1bb012b7b8d6716ff47918fc172eed84ab386f0897
++F Makefile.msc e9396e74d861d697e3aeb4b6d3972ff98a75d7bc8e36deca71970aa96f1e4b79
  F README.md 963d30019abf0cc06b263cd2824bce022893f3f93a531758f6f04ff2194a16a8
  F VERSION 4c09b629c03b8ae32317cb336a32f3aa3252841d6dcd51184cecc4278d08f21e
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -590,8 -588,8 +590,8 @@@ F ext/wasm/api/sqlite3-opfs-async-proxy
  F ext/wasm/api/sqlite3-v-helper.js 7daa0eab0a513a25b05e9abae7b5beaaa39209b3ed12f86aeae9ef8d2719ed25
  F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js 595953994aa3ae2287c889c4da39ab3d6f17b6461ecf4bec334b7a3faafddb02
  F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 46c4afa6c50d7369252c104f274ad977a97e91ccfafc38b400fe36e90bdda88e
- F ext/wasm/api/sqlite3-wasm.c c8c5b81b838cef2053b1eb6e7a79c44a2caedcf0c9e6b0d12a45d73ce0617be0
+ F ext/wasm/api/sqlite3-wasm.c 038de1b6d40b2cc0f41a143a0451db60b2a6f1b5bc06de67da255c54ea1661b7
 -F ext/wasm/api/sqlite3-worker1-promiser.c-pp.js bc06df0d599e625bde6a10a394e326dc68da9ff07fa5404354580f81566e591f
 +F ext/wasm/api/sqlite3-worker1-promiser.c-pp.js f10c3ecd9df06f6320073c2ce230a7ed7c56034d8b88c1e57095f2a97faf423a
  F ext/wasm/api/sqlite3-worker1.c-pp.js a541112aa51e16705f13a99bb943c64efe178aa28c86704a955f8fd9afe4ba37
  F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d0cef96fbbe4c8
  F ext/wasm/batch-runner.js 0dad6a02ad796f1003d3b7048947d275c4d6277f63767b8e685c27df8fdac93e
@@@ -643,7 -641,7 +643,7 @@@ F ext/wasm/wasmfs.make 8a4955882aaa0783
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
- F main.mk 535a322641096445c2d31584cf2f63da33b27142f2608a59ef8caaf10441278e
 -F main.mk 51fd5fc8565007266e6bfd9e299199c752b171707a667b8914a204b38258e1b1
++F main.mk 45dfa7a1a9745188f08d9a5bcf15680fe14382d24add829e34b281cd761d7eb7
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
  F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@@ -662,13 -660,13 +662,13 @@@ F src/auth.c 19b7ccacae3dfba23fc6f1d0af
  F src/backup.c 5c97e8023aab1ce14a42387eb3ae00ba5a0644569e3476f38661fa6f824c3523
  F src/bitvec.c 9eac5f42c11914d5ef00a75605bb205e934f435c579687f985f1f8b0995c8645
  F src/btmutex.c 79a43670447eacc651519a429f6ece9fd638563cf95b469d6891185ddae2b522
- F src/btree.c 764f91078449d701fc85ee580ed56554793f3bf9e11e7d3f5ddd327476c6d438
 -F src/btree.c f3b09c5414de3a11db73e11e1d66f4c5e53c9e89876ff3b531a887ab656ca303 x
++F src/btree.c edb79e04dbb4df37a67bcebdde0de4495dfba3c9948a93f6d10f74fd61ab2391 x
  F src/btree.h 03e3356f5208bcab8eed4e094240fdac4a7f9f5ddf5e91045ce589f67d47c240
  F src/btreeInt.h ef12a72b708677e48d6bc8dcd66fed25434740568b89e2cfa368093cfc5b9d15
- F src/build.c 1a9061ab67987cfa9c7f9d52ccc862a31d37ad2b05faaf0d72eeb4b4b5ee37cf
+ F src/build.c 189e4517d67f09f0a3e0d8e1faa6e2ef0c2e95f6ac82e33c912cb7efa2a359cc
  F src/callback.c db3a45e376deff6a16c0058163fe0ae2b73a2945f3f408ca32cf74960b28d490
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 -F src/ctime.c 23331529e654be40ca97d171cbbffe9b3d4c71cc53b78fe5501230675952da8b
 +F src/ctime.c 047a0613c4c3ff65e05903d5b6931185b3df8f34b5178ad2f8d865ada4e9da44
  F src/date.c eebc54a00e888d3c56147779e9f361b77d62fd69ff2008c5373946aa1ba1d574
  F src/dbpage.c 80e46e1df623ec40486da7a5086cb723b0275a6e2a7b01d9f9b5da0f04ba2782
  F src/dbstat.c 3b677254d512fcafd4d0b341bf267b38b235ccfddbef24f9154e19360fa22e43
@@@ -707,16 -705,16 +707,16 @@@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b
  F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06
  F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a
  F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
- F src/os_unix.c 2e8b12107f75d1bd16412f312b4c5d5103191807a37836d3b81beb26436ad81b
+ F src/os_unix.c cb116fde9e3ca3c1bbfdf89d6928f776a2a34da168e2667426523a4db353b271
  F src/os_win.c 4a50a154aeebc66a1f8fb79c1ff6dd5fe3d005556533361e0d460d41cb6a45a8
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c cc913d9d9f8a7dec2b3319b317f71b242ea15ef284eb2588f8e0b00721eea432
 -F src/pager.c 699aab8dfc88056d796b03b40c0ab979040d58dfc3ae9db207f1be91e4880bbf
 -F src/pager.h f4d33fec8052603758792045493423b8871a996da2d0973927b7d36cd6070473
++F src/pager.c b91155209abd567c0ffb384868bb6f148dfb58fb09006a6bffe4bcff96048601
 +F src/pager.h 1da654b51a4a002e6d8bf68fbdb454e1f31ebe43cc4d399a4dfb8da4ad2fe182
  F src/parse.y 020d80386eb216ec9520549106353c517d2bbc89be28752ffdca649a9eaf56ec
  F src/pcache.c 040b165f30622a21b7a9a77c6f2e4877a32fb7f22d4c7f0d2a6fa6833a156a75
  F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
  F src/pcache1.c 602acb23c471bb8d557a6f0083cc2be641d6cafcafa19e481eba7ef4c9ca0f00
- F src/pragma.c caa5cd189c887bba5c3cb5b36006dc3c7923166dbc1d2c703423f963744b0a1d
 -F src/pragma.c b3b4ad9c0298d63098a067acca613c21a5f56b4d176d5842922bcd0b07b7164e
++F src/pragma.c 087234c661e4f09e0cc53ae29ed59ed2e555d49c0dd12d913665a6bcf5ab9e1b
  F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
  F src/prepare.c bde74add20fc0e8ce0c4e937a1f70a36d17413afe4f71d3e103f5cb74b17c8d9
  F src/printf.c 9da63b9ae1c14789bcae12840f5d800fd9302500cd2d62733fac77f0041b4750
@@@ -793,11 -791,11 +793,11 @@@ F src/upsert.c fa125a8d3410ce9a97b02cb5
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c b22cc9f203a8c0b9ee5338a67f8860347d14845864c10248bebe84518a781677
  F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104
- F src/vdbe.c f4c10417a68e750892a1bd43b1dbb9b21913b3f1a2a1933276c0248d507c2fb2
 -F src/vdbe.c 14479441337135eed8e290fb1d4abb7db657d93217a3b1ea8a2f031d3895536a
++F src/vdbe.c ddf76d044e63873840065eaf939b3ba61d5aef7eaf642452a36187009d0adec4
  F src/vdbe.h 41485521f68e9437fdb7ec4a90f9d86ab294e9bb8281e33b235915e29122cfc0
  F src/vdbeInt.h 949669dfd8a41550d27dcb905b494f2ccde9a2e6c1b0b04daa1227e2e74c2b2c
  F src/vdbeapi.c fe654b1f54e1feebcaed6c2ae3ed035cc65bfeb9a1169bed866abc42bfc63ff6
- F src/vdbeaux.c b3872deb1802d01626ed4887519b9e62a4a501b00ba75a9765723df385fe1cf7
 -F src/vdbeaux.c dffcf79e7e415fcd6e4c8ac1ec7124cae5257018443adf09551c807655b04993
++F src/vdbeaux.c c572ba5dd18ca6b512c0c29352e6fe9039d5196af852853b84570870c5332969
  F src/vdbeblob.c 13f9287b55b6356b4b1845410382d6bede203ceb29ef69388a4a3d007ffacbe5
  F src/vdbemem.c c936e9002af4993b84c4eb7133d6b1190efe46d391cc86117ecd67ba17b1a04b
  F src/vdbesort.c 237840ca1947511fa59bd4e18b9eeae93f2af2468c34d2427b059f896230a547
@@@ -2152,8 -2139,8 +2153,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 79a920c036c91bbae737e4f4c5310052d26407fe7d23bcf95a2aa79ea3773a0f f20b4a96f747adeb2ed486f06dd7d911f0f24b37df87dcd32d2c3e4b687da9a6
- R a7fe7a47426bf4bb1fe5bda5434275ae
- U dan
- Z 03cc8cc242aa1de99e1b02558a042789
 -P 166c96d91dcc8c500a084d5703db103176ed5ec7d5f1334050cd66b3f1cd0e4f
 -R a40397540ae65bc3266dad738379719e
++P 3a6479d3f9d929c63e0caed6288d24ef004edee669d242285dea3fc60345038a c4f724de279dae1afd10d435ad61ed07c1e4658288457c50e4f9b2f4521bbe12
++R 51a2b89fd909d129432fbe246959a507
+ U drh
 -Z fc1d61aea6975cccbcf8186ffc5ca0c5
++Z ff9fd3da99fe2df062e7795be6fe3fd7
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 9548bd9f7954f37c280eeed43716f576d939fb6a,ad98d6629ab5e8869c16c41bff2be8a3c752741c..744d2e358c58498596ac902ddd82a3811ccbcf63
@@@ -1,1 -1,1 +1,1 @@@
- 3a6479d3f9d929c63e0caed6288d24ef004edee669d242285dea3fc60345038a
 -c4f724de279dae1afd10d435ad61ed07c1e4658288457c50e4f9b2f4521bbe12
++4f65ae2df071d2064ff1494b918c1dee2147e174f79060cd031c25f1aff70a7e
diff --cc src/btree.c
index db81cc7a013e140c62117b9e090b0fabea033a3c,5be30d562c7259bb819bea57861e4d59d4c4640a..9e6647839bcc6e9db748caf2ab74b95c8fc9c829
mode 100644,100755..100755
diff --cc src/pager.c
Simple merge
diff --cc src/pragma.c
Simple merge
diff --cc src/vdbe.c
Simple merge
diff --cc src/vdbeaux.c
Simple merge