From: drh <drh@noemail.net>
Date: Mon, 24 Feb 2020 13:26:29 +0000 (+0000)
Subject: Merge bugfix from trunk.
X-Git-Tag: version-3.32.0~148^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ed1b0e75336f547c72b4db50333e5ec38350888;p=thirdparty%2Fsqlite.git

Merge bugfix from trunk.

FossilOrigin-Name: b542dee9de843c19664c19df7435c6034d23d0d213804d588ec0ff599082d576
---

2ed1b0e75336f547c72b4db50333e5ec38350888
diff --cc manifest
index 9f902b1841,f338ba88f8..36169e66e6
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Do\snot\sactivate\sthe\struthProb\sadjustment\smechanism\sif\sthe\struth\sprobability\nis\sless\sthan\sthe\sheuristic\svalue,\sas\sthere\scould\sbe\scorrelations\sunknown\sto\nstat4.\s\sAlso\sadd\sadditional\stracing\soutput\sto\smake\struthProb\sadjustments\smore\nvisible.
- D 2020-02-22T18:27:48.175
 -C Fix\sa\sproblem\swith\sALTER\sTABLE\sfor\sviews\sthat\shave\sa\snested\sFROM\sclause.\nTicket\s[f50af3e8a565776b].
 -D 2020-02-23T17:34:45.938
++C Merge\sbugfix\sfrom\strunk.
++D 2020-02-24T13:26:29.409
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1859,7 -1858,7 +1859,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 243ab1852a2291595527ea1f26e78ad83eda285ae28f876bc1c703677f495cfa
- R 2719b1105cf4d47b954b372c20702e91
 -P f02030b3403d67734bba471a91ad5bfdb03ddf6fdc3ef14808a04495e43b0470
 -R 27f30806e168cf65f551539c0795adeb
++P c535fea147ce5c6e4aab25d3c85a3f53a7364c5b5ee10fb6d393c5911a02be7e c431b3fd8fd0f6a6974bba3e9366b0430ec003d570e7ce70ceefbcff5fe4b6fa
++R 540a6846dd3df06385ce1aa12449a267
  U drh
- Z e3872ca3639b1687907dbcae881883fa
 -Z b1d396f928d83f91cde5e969c202f590
++Z eee179433b7c26e18c07c4463c4efe9e
diff --cc manifest.uuid
index e6f868ae79,fc3a50b794..b8c0a97d33
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c535fea147ce5c6e4aab25d3c85a3f53a7364c5b5ee10fb6d393c5911a02be7e
 -c431b3fd8fd0f6a6974bba3e9366b0430ec003d570e7ce70ceefbcff5fe4b6fa
++b542dee9de843c19664c19df7435c6034d23d0d213804d588ec0ff599082d576