From: drh <drh@noemail.net>
Date: Wed, 15 Nov 2017 16:29:02 +0000 (+0000)
Subject: Merge all the latest changes from trunk.
X-Git-Tag: version-3.22.0~98^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e8cf76c8a1251287cde75c7a335c86651c67fbd;p=thirdparty%2Fsqlite.git

Merge all the latest changes from trunk.

FossilOrigin-Name: 1a1a73b821eb1a22ca335f582a0aea31c71ca9f5b09d54f26409691c90e38c4a
---

7e8cf76c8a1251287cde75c7a335c86651c67fbd
diff --cc manifest
index e9413c8f80,1475fea8d1..ec7a538103
--- a/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Initial\simplementation\sof\sthe\sappendvfs\sextension.\s\sUntested.
- D 2017-10-21T12:59:27.233
- F Makefile.in e016061b23e60ac9ec27c65cb577292b6bde0307ca55abd874ab3487b3b1beb2
 -C In\sthe\sparse\stree,\scombine\sLIMIT\sand\sOFFSET\sinto\sa\ssingle\sexpression\srooted\non\sa\sTK_LIMIT\snode,\sfor\sa\ssmall\scode\ssize\sreduction\sand\sperformance\sincrease,\nand\sa\sreduction\sin\scode\scomplexity.
 -D 2017-11-14T23:48:23.099
++C Merge\sall\sthe\slatest\schanges\sfrom\strunk.
++D 2017-11-15T16:29:02.752
+ F Makefile.in b142eb20482922153ebc77b261cdfd0a560ed05a81e9f6d9a2b0e8192922a1d2
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 37740aba9c4bb359c627eadccf1cfd7be4f5f847078723777ea7763969e533b1
+ F Makefile.msc a55372a22454e742ba7c8f6edf05b83213ec01125166ad7dcee0567e2f7fc81b
  F README.md f5c87359573c4d255425e588a56554b50fdcc2afba4e017a2e02a43701456afd
- F VERSION f81232df28e2d3ff049feefad5fbd5489cc33697f6bd2ecf61af7f0dde3b83d0
+ F VERSION 0c10cdfed866fdd2d80434f64f042c3330f1daaed12e54287beb104f04b3faaf
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -258,7 -258,7 +258,8 @@@ F ext/lsm1/test/lsm1_simple.test ca949e
  F ext/misc/README.md 8e008c8d2b02e09096b31dfba033253ac27c6c06a18aa5826e299fa7601d90b2
  F ext/misc/amatch.c 6db4607cb17c54b853a2d7c7c36046d004853f65b9b733e6f019d543d5dfae87
  F ext/misc/anycollseq.c 5ffdfde9829eeac52219136ad6aa7cd9a4edb3b15f4f2532de52f4a22525eddb
 +F ext/misc/appendvfs.c 487a5db4427d118413346780c4c90d0256315e8de3fb528ee54daef3bb73276f
+ F ext/misc/btreeinfo.c d7fd9a2fe2fa33ba28488e2fce703ebecc759219ea9e0bb3b254784866c0a676
  F ext/misc/carray.c ed96c218ea940b85c9a274c4d9c59fe9491c299147a38a8bba537687bd6c6005
  F ext/misc/closure.c 0d2a038df8fbae7f19de42e7c7d71f2e4dc88704
  F ext/misc/completion.c 52c3f01523e3e387eb321b4739a89d1fe47cbe6025aa1f2d8d3685e9e365df0f
@@@ -1665,10 -1677,7 +1678,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 04925dee41a21ffca9a9f9df27d8165431668c42c2b33d08b077fdb28011170b
- R b5d8b4b601b02e4902be4e639107c749
- T *branch * appendvfs
- T *sym-appendvfs *
- T -sym-trunk *
 -P 00ec95fcd02bb415dabd7f25fee24856d45d6916c18b2728e97e9bb9b8322ba3
 -R 9fe4e3d4453a36374c8a196662e2c5b0
++P 063a03a3779e8c032dd006712facaaa6d60964425701ea10c753ff981a8f2bd9 3925facd942c9df663f9b29b1e6f94f6be14af8c2b99eb691bfc836b4c220826
++R c7a14dabad9b6d1a92ae6a806b590590
  U drh
- Z 11816656e34dd3c798cb5d3f2287708a
 -Z 3ab594fe26a5b432ce6d9e25b1b1040f
++Z afc7a4b7b3683c496a44306e363185c7
diff --cc manifest.uuid
index 69ef83190d,41cb7f1619..b1cf4103fd
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 063a03a3779e8c032dd006712facaaa6d60964425701ea10c753ff981a8f2bd9
 -3925facd942c9df663f9b29b1e6f94f6be14af8c2b99eb691bfc836b4c220826
++1a1a73b821eb1a22ca335f582a0aea31c71ca9f5b09d54f26409691c90e38c4a