From: drh <>
Date: Mon, 3 Oct 2022 13:24:28 +0000 (+0000)
Subject: Merge the latest trunk enhancements into the kv-vfs branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1dcf538b1143d4b9a1e7dbbc0a5a77b46b25156;p=thirdparty%2Fsqlite.git

Merge the latest trunk enhancements into the kv-vfs branch.

FossilOrigin-Name: f4aefe63d9126a4d8af70be3ea6ac407235e597e8b55b1575897129106cc5689
---

b1dcf538b1143d4b9a1e7dbbc0a5a77b46b25156
diff --cc manifest
index d9677a2ca9,50270d8b40..eaaae02a8a
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\san\suninitialized\svariable\sin\sthe\sdecoder\skv-vfs.
- D 2022-09-17T18:31:31.300
 -C Minor\sdoc\stypo\sfix\sin\ssqlite.h.in.
 -D 2022-10-02T20:13:46.207
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\skv-vfs\sbranch.
++D 2022-10-03T13:24:28.603
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -555,8 -552,8 +555,8 @@@ F src/insert.c aea5361767817f917b0f0f64
  F src/json.c 7749b98c62f691697c7ee536b570c744c0583cab4a89200fdd0fc2aa8cc8cbd6
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 853385cc7a604157e137585097949252d5d0c731768e16b044608e5c95c3614b
 -F src/main.c 8983b4a316d7e09946dd731913aa41712f02e2b55cb5c6c92126ccfe2473244a
 +F src/main.c e11267cdd380be68d95d4292666636a7f1dff5f17a395f3d55be910d7e9350fb
- F src/malloc.c b7a3430cbe91d3e8e04fc10c2041b3a19794e63556ad2441a13d8dadd9b2bafc
+ F src/malloc.c dfddca1e163496c0a10250cedeafaf56dff47673e0f15888fb0925340a8e3f90
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
  F src/mem2.c c8bfc9446fd0798bddd495eb5d9dbafa7d4b7287d8c22d50a83ac9daa26d8a75
@@@ -592,12 -588,12 +592,12 @@@ F src/printf.c e99ee9741e79ae3873458146
  F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
  F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c d69dfb5b082f9a25e6700e152ddb3d942359b847b1df504eb09f9b4531844f8d
+ F src/select.c bb18acf4eded647fef88d4d543c673874dbebff516fbeba90a85e6c13f2a58cd
  F src/shell.c.in e7e7c2c69ae86c5ee9e8ad66227203d46ff6dce8700a1b1dababff01c71d33df
- F src/sqlite.h.in b9b7fd73239d94db20332bb6e504688001e5564b655e1318a4427a1caef4b99e
+ F src/sqlite.h.in 3f4695457fcb41ea8a44c6d09fc2a591bbeda44b13bda86618f3ce0071bbca7c
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
- F src/sqliteInt.h 587be0322bf30f248350e9b0d1d36feeece94f30bcf057686c6425c36b8ed3c5
 -F src/sqliteInt.h 7571703e6d11cd0e0283be68e9b6baceefedf10e3bbac5869d12183e031c5254
++F src/sqliteInt.h 13e1876c4694958683eac18974ebfc71ac0793f643c0956fb0ff6b8a15337dc0
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -2004,8 -2000,8 +2004,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 852812d1e2ec3c53ad7c6c64662b37d861fefcf1baeee3d58eba88bcb3f6d8df
- R 9c6620d4dc4ed0d3ddc9cc9e79cbabf7
 -P cd494240cc6184bb028d1f1049086f57c0a71a43d7ed1405fd4205240e1b9e61
 -R 63d9c2979689d3960bbd738edf79070f
 -U stephan
 -Z 0ea9b225897586b46dcecb74f7edb744
++P 354726aa6c399053785f29104de15091629ce4bc275b9e2205cb3656a9e81cd7 372802aaa22a830bf498bb0d9561ae02b32e5e191c4d7d771ea152140f6685a1
++R 4854c3432db449e1fae660a012e3b3de
 +U drh
- Z 7ef728d647d25bb1b8240f0a67ed5ff5
++Z eed47a5027f3d0365a6567b793b0f94f
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 1336748789,4b7393393e..612dd57621
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 354726aa6c399053785f29104de15091629ce4bc275b9e2205cb3656a9e81cd7
 -372802aaa22a830bf498bb0d9561ae02b32e5e191c4d7d771ea152140f6685a1
++f4aefe63d9126a4d8af70be3ea6ac407235e597e8b55b1575897129106cc5689