From: drh <drh@noemail.net>
Date: Mon, 20 Feb 2017 13:11:07 +0000 (+0000)
Subject: Merge fixes from trunk.
X-Git-Tag: version-3.18.0~81^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad67e66dcaa49509b7d2a528fe982d3bbaf4e7cd;p=thirdparty%2Fsqlite.git

Merge fixes from trunk.

FossilOrigin-Name: ff213f2ef5bf96754a2264685d25546d8b5ccf0a
---

ad67e66dcaa49509b7d2a528fe982d3bbaf4e7cd
diff --cc manifest
index 420fc4058d,44763338e4..1f4c33857e
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Updated\scomments.\s\sNo\scode\schanges.
- D 2017-02-18T22:52:40.654
 -C Add\sthe\sSQLITE_BUG_COMPATIBLE_20160819\scompile-time\soption\sto\somit\sthe\serror\nmessage\swhen\san\sunrecognized\sargument\sis\sprovided\sto\sthe\sVACUUM\scommand.
 -D 2017-02-18T13:47:11.181
++C Merge\sfixes\sfrom\strunk.
++D 2017-02-20T13:11:07.110
  F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc a89ea37ab5928026001569f056973b9059492fe2
@@@ -460,8 -460,8 +460,8 @@@ F src/trigger.c c9f0810043b265724fdb1bd
  F src/update.c 456d4a4656f8a03c2abc88a51b19172197400e58
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c ca8440ede81e155d15cff7c101654f60b55a9ae6
- F src/vacuum.c 33c174b28886b2faf26e503b5a49a1c01a9b1c16
+ F src/vacuum.c 1fe4555cd8c9b263afb85b5b4ee3a4a4181ad569
 -F src/vdbe.c 16f378640570c24442fd7191b136b5d6380f5c7b
 +F src/vdbe.c 02f9db522c73ba4e1743585e9fd6f8ac6c71515b
  F src/vdbe.h 59998ffd71d7caa8886bc78dafaf8caeccd4c13c
  F src/vdbeInt.h 4e4b15b2e1330e1636e4e01974eab2b0b985092f
  F src/vdbeapi.c 3e4a8893feeb78620f4aac4ac5b85d92255b97e1
@@@ -1557,7 -1556,7 +1557,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 d386015f5e7ecdd951d70db56b7bbd858be7ad90
- R bb5056af5425096e2e052e924ae83b2e
 -P 8cc9d74c176a78aeebfbb39198c21b5dd547ff52
 -R 57839b570efd132c834489fe34d93e5e
++P e842ad391e62df273a5b1ed569d42ea46d03a99b 491814272dce7e937b4734fcbc2ad69e12377b56
++R 9def7926ef27f77a7e1d535aaff2eb82
  U drh
- Z a573182d78be17d037798d5840f110fc
 -Z 38cfd439ab0cfeae01cbf1d291727475
++Z ee1e0d41251dc153fd55728fd5740a3d
diff --cc manifest.uuid
index d08504dc8d,557d9a7e8b..969c5d24f3
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e842ad391e62df273a5b1ed569d42ea46d03a99b
 -491814272dce7e937b4734fcbc2ad69e12377b56
++ff213f2ef5bf96754a2264685d25546d8b5ccf0a