From: drh <drh@noemail.net>
Date: Thu, 12 Dec 2019 16:49:10 +0000 (+0000)
Subject: Merge enhancements from trunk.
X-Git-Tag: version-3.31.0~87^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=20d6c1fe1bafcef4b60656a4f2c6da03cc5b98ed;p=thirdparty%2Fsqlite.git

Merge enhancements from trunk.

FossilOrigin-Name: 6cb053f99b5be2ecc30e0733d8f1e4f2a89f642656d3883fc0c867b10a87ba6b
---

20d6c1fe1bafcef4b60656a4f2c6da03cc5b98ed
diff --cc manifest
index ca38c913ca,b8222b9a3f..146060627c
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C More\sefficient\simplementation\sof\sa\slookaside\sallocator\sthat\ssupports\smini\s(in\sthis\scase,\sharcoded\sto\s128B)\sslots.
- D 2019-12-12T02:50:07.468
 -C Factor\sout\sthe\sconditional\s(which\sis\sonly\strue\sfor\srare\serrors)\sfrom\sthe\nnotValid()\sfunction\sin\sresolve.c,\sfor\sa\sperformance\simprovement\sand\ssize\nreduction.\s\sAlso\scause\sfailures\sto\sset\sthe\sExpr\snode\sto\sa\sNULL\soperator\sso\nthat\sit\sdoes\snot\scause\sproblems\slater\sin\scase\sPRAGMA\swritable_schema=ON\shas\nbeen\sset.\s\sTest\scases\sin\sTH3.
 -D 2019-12-12T15:19:18.293
++C Merge\senhancements\sfrom\strunk.
++D 2019-12-12T16:49:10.371
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1852,10 -1852,7 +1852,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 48ba5e5a2227257cebafacbb09e9dd91d9b89ab2d52a8b4e4113c1d017d95f41
- R 7ee7a134ba45ae790f475dbb2e983799
- T *branch * mini-lookaside-take-2
- T *sym-mini-lookaside-take-2 *
- T -sym-trunk *
- U numist
- Z aef044ee81b705b7df5a6b1d29e511a6
 -R fa3b00322fb92ab48dfb99988a8bcb8c
++P b02fdc09c838f355d9efce57f817d6a86153153b4a1f2b763914f4aaa34cb76e c6af9f655b73200ecc0c4189698e421af6ca584babdc76e73a36d468b2eea1f9
++R acd8cbaefaeedad19b6643abb0f66a70
+ U drh
 -Z 6fc68518985b2fcb5b612f7541971122
++Z 68e3e8eeb067499423bb6b0f8443d732
diff --cc manifest.uuid
index c14893ca2e,de3ce2760b..1583d58553
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b02fdc09c838f355d9efce57f817d6a86153153b4a1f2b763914f4aaa34cb76e
 -c6af9f655b73200ecc0c4189698e421af6ca584babdc76e73a36d468b2eea1f9
++6cb053f99b5be2ecc30e0733d8f1e4f2a89f642656d3883fc0c867b10a87ba6b