From: drh <>
Date: Thu, 29 Jul 2021 14:27:16 +0000 (+0000)
Subject: Merge the latest enhancements from trunk.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fwin-blocking-locks;p=thirdparty%2Fsqlite.git

Merge the latest enhancements from trunk.

FossilOrigin-Name: 8498d7727c25859f1a48b85bec44a0b9ad6e8c48112498d6c71882458970c637
---

5d6ae89c21da9956b711851b34445c8769489585
diff --cc manifest
index c6df8b1ad4,9a4cb795d9..cc1d495061
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\s".connection"\sCLI\senhancement\sfrom\strunk.
- D 2021-07-23T19:26:06.314
 -C Remove\sALWAYS()\smacros\sthat\scan\sbe\strue\sif\sthe\sinternal\stest\sfunction\nimplies_nonnull_row()\sis\sused\sin\sthe\sresult\sset\sof\sa\squery\sand\scontains\ncomparison\soperator\sagainst\sa\scomputed\scolumn.\ndbsqlfuzz\s4c34db5bff6247f33ee49e341a1f3018e72be0a0.
 -D 2021-07-29T00:33:20.860
++C Merge\sthe\slatest\senhancements\sfrom\strunk.
++D 2021-07-29T14:27:16.814
  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 9ecad2f8c6ee5ce3d8128d646d7de6acb1c8dae1d688bbd0eb3233b364bc9ca4 54eaf076c05887157179459ab39c2556953f6fef9c1b14f17a8aa74087da3023
- R 0830ed2cdc1ea25ffb6b0cb306a449b5
 -P a2fc531177c3a061f2881198bb711d502db7cd831351b6a5dd415936845b6625
 -R 302893be0ad635d55b2ba074ef459057
++P d317d44fbba53883d2b85846d61d4738891bd98f8045ae58e56ddfe6f27ab01a 4d1dbfa35c7dc0f09321b2e274a00e506f4ca65322454652d5891d815a6966d3
++R 49dbd10e8caa8f5bdad813af0e201c27
  U drh
- Z 2fec14357d79aa55a2bf5b767c0d5533
 -Z 214bc8f469ab254a07e1605231d14a09
++Z f609898ce79cf103e62694adc86b9cfa
diff --cc manifest.uuid
index 8685fb9fdc,7ce3f9f163..2b4689e12f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d317d44fbba53883d2b85846d61d4738891bd98f8045ae58e56ddfe6f27ab01a
 -4d1dbfa35c7dc0f09321b2e274a00e506f4ca65322454652d5891d815a6966d3
++8498d7727c25859f1a48b85bec44a0b9ad6e8c48112498d6c71882458970c637