From: drh <drh@noemail.net>
Date: Sat, 4 Jan 2020 19:19:54 +0000 (+0000)
Subject: Merge all fixes and enhancements from trunk.
X-Git-Tag: version-3.31.0~45^2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ad4f792a9ad661021fbca0c845711675dba1fcb;p=thirdparty%2Fsqlite.git

Merge all fixes and enhancements from trunk.

FossilOrigin-Name: b878c30f03e895bbc5c4c99c0f727d49093bb78bdc275593cf4852148579ae69
---

0ad4f792a9ad661021fbca0c845711675dba1fcb
diff --cc manifest
index af75ba24d9,b57e98dd45..b9177bbb7a
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\sfixes\sfrom\strunk.
- D 2020-01-04T15:37:57.154
 -C Fix\sDBSTAT\sso\sthat\sit\sreturns\snow\srows,\srather\sthan\san\serror\swhen\sthe\nWHERE\sclause\sis\s"schema=NULL".
 -D 2020-01-04T19:14:48.556
++C Merge\sall\sfixes\sand\senhancements\sfrom\strunk.
++D 2020-01-04T19:19:54.288
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1853,7 -1853,7 +1853,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 9ca906d24a2e88eddb2fd067783512b66cfc49dce1596d816a1c38a09d128218 9da48a5ca66dc67c8f7fb2d2471dac7ea696e35ecba5ddf65747d08d452436c1
- R f1e8c2fdadd2c7adf9f3f606e5523e89
 -P 8452fe03430d34abecab618d6136b863630f91d68d69ebbc115f808bc81c3817
 -R 9bbb5a6f7d16bf33483ed4a1fd18c9fb
++P 26ef709a47294c512a70aecd37d29caecec2af261977d9fb2c4d78d09b12f77a 5b246b47aeadc25dbec0956e2d6edcd49fbe874a01734fdf15b770507648222d
++R 23b6db5bd743b43a08b2a78aa5bfe764
  U drh
- Z e63518841f864c4385c87d6e5e95c38e
 -Z 32947d987d272ea0b93a36e52a4c48c8
++Z df93cd8dd048f13be0eda50d95f72385
diff --cc manifest.uuid
index 61524bc2e1,336cd39a14..1ec699ac35
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 26ef709a47294c512a70aecd37d29caecec2af261977d9fb2c4d78d09b12f77a
 -5b246b47aeadc25dbec0956e2d6edcd49fbe874a01734fdf15b770507648222d
++b878c30f03e895bbc5c4c99c0f727d49093bb78bdc275593cf4852148579ae69