From: drh <drh@noemail.net>
Date: Thu, 4 Aug 2016 13:39:44 +0000 (+0000)
Subject: Merge all recent enhancements from trunk.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e1accd0e77221df4489e296c586577d419f3be2;p=thirdparty%2Fsqlite.git

Merge all recent enhancements from trunk.

FossilOrigin-Name: dacfff514034602361cd5325deba8d9b9691f865
---

7e1accd0e77221df4489e296c586577d419f3be2
diff --cc manifest
index 2158a10936,5b9bd0d8e5..7ea0260f60
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Add\sthe\sexperimental\sSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION\scompile-time\soption.\nWhen\senabled,\sthe\s"unknown\sfunction"\serror\sis\ssuppressed\sfor\sEXPLAIN\sand\na\sno-op\sfunction\snamed\s"unknown()"\sis\ssubstituted.\s\sThis\sfacilitiates\susing\nthe\scommand-line\sshell\sto\sanalyze\squeries\sfrom\sapplications\sthat\scontain\nmany\sapplication-defined\sfunctions\sthat\sare\snot\snormally\savailable\sto\sthe\nshell.
- D 2016-08-04T12:33:10.560
 -C Revert\sthe\sSQLITE_APICALL\schanges\sfor\snow.\s\sThat\schanges\sneeds\sfurther\nresearch\sbefore\sit\sis\sreleased.\s\sDeferred\suntil\s3.15.
 -D 2016-08-04T13:23:28.286
 -F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
++C Merge\sall\srecent\senhancements\sfrom\strunk.
++D 2016-08-04T13:39:44.698
 +F Makefile.in b0c3cd9e30ffb18d6952dbf3c2ee5ae07c6216d4
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 817e65faf9ad66a8d462e5b5e645be600213efb8
 -F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
++F Makefile.msc c5b2eca5bdf5f73fe9eebf78f07755e2509fd629
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION cb29eb11e493dd85b3eeec4053c03949bf98478e
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -1455,8 -1450,8 +1455,8 @@@ F tool/mkopts.tcl 66ac10d240cc6e86abd37
  F tool/mkpragmatab.tcl f0d5bb266d1d388cf86fce5ba01a891e95d72d41
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl aa58ea3be311c81821c2cd3209f55e46b07ab656
- F tool/mksqlite3c.tcl af4b267e6a8546c31dd0b458b720cb567b9ea474
- F tool/mksqlite3h.tcl cf5cd68028e69a51ed5c76042672664201f0f756
 -F tool/mksqlite3c.tcl 63af8429841f08552e6da1d93b3dee4a93ff8071
++F tool/mksqlite3c.tcl bfafc3e96885a2afa8b0d733826ee89e2db3d8b3
+ F tool/mksqlite3h.tcl e7b106fc4f29fbc258e8ba9b88d9108332ea2ade
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl 4abcaf3267171b2faadaf9b82a0dfbaa6e98f8b7
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@@ -1514,8 -1509,7 +1514,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 bf5a9542d0600062651aedc6d2543ce72dd21744
- Q +4ada023ca075628fdafc3bc4520239b9789cff29
- R ddaefb1382fa6774bc6c6d139309d2e0
 -P b7f30a9ff20d580fdaecdcf2b644d09ad6c2575e
 -R 54afa4c645a3de150c21fe8a3504aa0b
++P e22ca3cdd02483b68595a59ccb7a1fcb3580ab04 9adda385267d1a0ecff259b42a284913668441a2
++R 6bd714ecd3e4d00065ff30edf27ebb48
  U drh
- Z 6693873287e132db2ef3bf21d7103b19
 -Z 5a54570e253d8550ab3d18086a0dcdce
++Z c0ee788ceb69ebaffc2368f7cc8614b3
diff --cc manifest.uuid
index 5fa81bcf18,3bacaad736..54d2f123df
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e22ca3cdd02483b68595a59ccb7a1fcb3580ab04
 -9adda385267d1a0ecff259b42a284913668441a2
++dacfff514034602361cd5325deba8d9b9691f865