From: drh <drh@noemail.net>
Date: Thu, 7 Jun 2018 15:28:40 +0000 (+0000)
Subject: Merge the ".stat/.eqp" CLI fix from trunk.
X-Git-Tag: version-3.25.0~207^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64c1f77a8e066e0bdbd640cfd97c87a5094cefb9;p=thirdparty%2Fsqlite.git

Merge the ".stat/.eqp" CLI fix from trunk.

FossilOrigin-Name: a91cad3381bb843d6f58975251bf99f0fa1a1398fae53d97a98a6c8ee65e718e
---

64c1f77a8e066e0bdbd640cfd97c87a5094cefb9
diff --cc manifest
index f93277565d,ae7fdac937..cc162b66ab
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sthe\sWHERE_IN_EARLYOUT\sflag\sand\suse\sit\sto\sclarify\sthe\slogic\sof\sthis\noptimization.
- D 2018-06-07T14:59:22.505
 -C Avoid\susing\sa\sprepared\sstatement\sfor\s".stats\son"\safter\sit\shas\sbeen\sclosed\nby\sthe\s".eqp\sfull"\slogic.\s\sFix\sfor\sticket\s[7be932dfa60a8a6b3b26bcf76].
 -D 2018-06-07T15:23:43.571
++C Merge\sthe\s".stat/.eqp"\sCLI\sfix\sfrom\strunk.
++D 2018-06-07T15:28:40.178
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
@@@ -1730,7 -1730,7 +1730,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 e9d7bf4f7b9d6f8dabc4c95d43ebf12f2149bed1c5e750048b1b684128073c38
- R 6d4277fa9b6622056a87cf8567cfc5ae
 -P 71f97f0f82b3abfb07feb78d64a182fc50ff396e85d6f5aac479dbf58ba4d00a
 -R 88b349f4995942bbb83ef8407ed20dc3
++P 522f1eacc20f11002cad58232a7c2610f369568653510e54f46088f579f778dc bb87c054b1b76959e46258ac66b24027f468b390a4148ac67f208a1fbeda4060
++R ab39df9e13ae287891b82fbbff6e201a
  U drh
- Z c9c3d95e2b08432c3b21f5302501cc1d
 -Z 107f8808affc9ffe8154c296896c4113
++Z 011ea25541aef6f0f28ebbe3afa79009
diff --cc manifest.uuid
index a179c92a9c,c4bf873456..5b41398eef
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 522f1eacc20f11002cad58232a7c2610f369568653510e54f46088f579f778dc
 -bb87c054b1b76959e46258ac66b24027f468b390a4148ac67f208a1fbeda4060
++a91cad3381bb843d6f58975251bf99f0fa1a1398fae53d97a98a6c8ee65e718e