From: drh <>
Date: Fri, 23 Jul 2021 14:53:09 +0000 (+0000)
Subject: Merge recent enhancements on trunk into the win-blocking-locks branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93dc177980aefb925595d9df79b4660f460fce90;p=thirdparty%2Fsqlite.git

Merge recent enhancements on trunk into the win-blocking-locks branch.

FossilOrigin-Name: 9ecad2f8c6ee5ce3d8128d646d7de6acb1c8dae1d688bbd0eb3233b364bc9ca4
---

93dc177980aefb925595d9df79b4660f460fce90
diff --cc manifest
index 1679c1a9a3,5883a6aee2..e164a008aa
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Minor\senhancements\sto\snew\sOSTRACE\smessages.
- D 2021-07-19T03:37:09.404
 -C Set\sthe\scheckSchema\sflag\sif\sa\sCREATE\sTABLE\sparse\sfails\sbecause\sthe\stable\nalready\sexists,\sto\sensure\sthat\sthe\stable\swas\snot\spreviously\sdeleted\sby\nsome\sother\sconnection.
 -D 2021-07-22T21:11:06.648
++C Merge\srecent\senhancements\son\strunk\sinto\sthe\swin-blocking-locks\sbranch.
++D 2021-07-23T14:53:09.233
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1920,7 -1920,7 +1920,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 584c24252a37ef050ced5926a93e52fc47a41d9017b291dc1c1c796712e391d7
- R ec8d709aae6243cae1e8538086c8738b
- U mistachkin
- Z 75f70c9db372d7b49e7d3c6bedb72509
 -P b65f4f763979ee9e0b943c787609ea22d6f7e01d41dfc1e084ec50a085a3550c
 -R ed9a1584f4d75ade417ceb251baf5a51
++P 3249a6a38d9c86d45d5d04b32d552f306d12fd4d3c94d2efed192104c0c3948a 91bcb9621529b58d28e91a2763eb9eef3951400d5eaef105073258f3dd331872
++R 98d111fbbc918b923c6ed746e9c23fad
+ U drh
 -Z f439f5ab1be78d6d001ae417ae6fc683
++Z 8c10d6a60485e7ed9fa28339d1e50632
diff --cc manifest.uuid
index 500488841c,2645917039..877c51f5cb
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3249a6a38d9c86d45d5d04b32d552f306d12fd4d3c94d2efed192104c0c3948a
 -91bcb9621529b58d28e91a2763eb9eef3951400d5eaef105073258f3dd331872
++9ecad2f8c6ee5ce3d8128d646d7de6acb1c8dae1d688bbd0eb3233b364bc9ca4