From: drh <>
Date: Sat, 17 Sep 2022 17:26:44 +0000 (+0000)
Subject: Merge the latest trunk enhancements into the kv-vfs branch.
X-Git-Tag: version-3.40.0~169^2~93^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b9fbc558f797d25d50a32150c8fcedf490f74015;p=thirdparty%2Fsqlite.git

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

FossilOrigin-Name: 37c7ca25a6e837e7f83b96a32e2b1a455730e48a48012c458ae2e734a3ccdd1f
---

b9fbc558f797d25d50a32150c8fcedf490f74015
diff --cc manifest
index 62feced741,6c8b53652d..82c40c633a
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Corrections\sto\sthe\sxRead\smethod\sfor\sdatabases\sin\sthe\sos_kv.c\sVFS\sso\sthat\sit\ncorrectly\sreads\sthe\sheader,\sand\sthus\savoids\sunnecessary\scache\sflushes.\s\sThis\nchanges\salso\sincludes\san\soptimization\sto\sthe\sheader\sread\slogic.
- D 2022-09-16T15:19:04.113
 -C New\srun-time\soptions\sto\sthe\sspeed-check.sh\sscript.
 -D 2022-09-12T16:07:24.415
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\skv-vfs\sbranch.
++D 2022-09-17T17:26:44.762
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -574,10 -571,9 +574,10 @@@ F src/notify.c 89a97dc854c3aa62ad5f384e
  F src/os.c 0eb831ba3575af5277e47f4edd14fdfc90025c67eb25ce5cda634518d308d4e9
  F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 -F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 -F src/os_unix.c 102f7e5c5b59c18ea3dbc929dc3be8acb3afc0e0b6ad572e032335c9c27f44f1
 +F src/os_kv.c 3a2d319988df9da8f3a4d0c753a1492542bd3017ff7ae5d07814460eac6b0b19
 +F src/os_setup.h 0711dbc4678f3ac52d7fe736951b6384a0615387c4ba5135a4764e4e31f4b6a6
 +F src/os_unix.c 0fa91925f0b8831fc0156a9c04d39d86f85baf9eef66c98712395e1715cb75cc
- F src/os_win.c e9454cb141908e8eef2102180bad353a36480612d5b736e4c2bd5777d9b25a34
+ F src/os_win.c 8d129ae3e59e0fa900e20d0ad789e96f2e08177f0b00b53cdda65c40331e0902
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
  F src/pager.c 6176d9752eb580419e8fef4592dc417a6b00ddfd43ee22f818819bf8840ceee8
  F src/pager.h f82e9844166e1585f5786837ddc7709966138ced17f568c16af7ccf946c2baa3
@@@ -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 21915af560b111aeeaee751790356151a5f063c2fc703dd4b35b22dc393409fb
- R 64099072882bb903603d527810cdf234
 -P 73c4c68d3b4c16caf8281dabddd7365d24691e5ee2da89b1783eca66bfbd9280
 -R 8caad88aec151feccca0c9cd18faaecf
++P ef54961ce69fddb4cfeeff0860288de2858a6f7a5aa396691e8e99933eb9af54 ff46bc9d2a844dde9dafa157114f4d9ee157205ca5c08ed9ee32f018de310e62
++R 4de08b84ca8222edc80a9a00d8c86ac4
  U drh
- Z 33c23cb0033c7cdf863f626ff2ea91a9
 -Z 5694145593725214ff362dc6756dc32c
++Z f60f4623d1ae77ea9ba72cf01682f06f
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 54e92cfb4b,ee1e7a8414..21c52cde0a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ef54961ce69fddb4cfeeff0860288de2858a6f7a5aa396691e8e99933eb9af54
 -ff46bc9d2a844dde9dafa157114f4d9ee157205ca5c08ed9ee32f018de310e62
++37c7ca25a6e837e7f83b96a32e2b1a455730e48a48012c458ae2e734a3ccdd1f