From: drh <drh@noemail.net>
Date: Wed, 7 Nov 2018 16:12:34 +0000 (+0000)
Subject: Merge the onefile permutation fix from trunk.
X-Git-Tag: version-3.26.0~47^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b39dd52adbcf8515c72c488e078a385630a86a23;p=thirdparty%2Fsqlite.git

Merge the onefile permutation fix from trunk.

FossilOrigin-Name: e543bff87d1efc31a5b863085c056ce06c365cc7d9d3fef0ced7521bde536783
---

b39dd52adbcf8515c72c488e078a385630a86a23
diff --cc manifest
index eb0ff22917,1ec49b32d9..4ef71d9841
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C More\stest-case\sadjustments\sfor\sdefensive\smode.
- D 2018-11-07T14:41:08.900
 -C Fix\sa\sproblem\swith\sthe\shandling\sof\sSQLITE_FCNTL_PRAGMA\sin\sthe\stest_onefile.c\ndemo.
 -D 2018-11-07T14:39:22.900
++C Merge\sthe\sonefile\spermutation\sfix\sfrom\strunk.
++D 2018-11-07T16:12:34.740
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in edbb6e20bb1decf65f6c64c9e61004a69bdf8afb39cdce5337c916b03dfcd1e3
@@@ -1776,7 -1776,7 +1776,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 b753d849fe0524e14ae9367a47e29be76332fafb77bfe13e266aeef1ef6742ce
- R 580e901d8f1a1e7956c16f5cbdc33912
 -P cbf85284beb60d068b446c52f000d694a810d4de9096ad2951523a4c88e7334c
 -R 088caf8858ff5594a1a4116e158cb2b6
 -U dan
 -Z 62eba71f05524b2e0125783d546c8de7
++P 911e8a17a3810cd7042e91a32aba80dc3d6be88320c208e48f7bcee8b22a0ff2 13e21b7da8fe754e230b09ca0b9f1f69cd9aa20d4407ddd8b95ca3fb18c9abeb
++R 56bf1824a48b5de2380d01acb7d29fb0
 +U drh
- Z 9fcbd0668e3a5c715761bcabc2f89bae
++Z b5475e4e894f27e1fb706ff1a175ea2a
diff --cc manifest.uuid
index 0f8c20eeb6,f301856ba3..531c357390
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 911e8a17a3810cd7042e91a32aba80dc3d6be88320c208e48f7bcee8b22a0ff2
 -13e21b7da8fe754e230b09ca0b9f1f69cd9aa20d4407ddd8b95ca3fb18c9abeb
++e543bff87d1efc31a5b863085c056ce06c365cc7d9d3fef0ced7521bde536783