From: drh <drh@noemail.net>
Date: Thu, 25 Aug 2016 22:31:44 +0000 (+0000)
Subject: Merge recent changes from trunk.
X-Git-Tag: version-3.15.0~110^2~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3cc19132dae32c875308af463debd2410f3a4caf;p=thirdparty%2Fsqlite.git

Merge recent changes from trunk.

FossilOrigin-Name: 5789aab8ef59ae1cdfdae123b078ee03da6e08ed
---

3cc19132dae32c875308af463debd2410f3a4caf
diff --cc manifest
index 5805cde823,2a732336ae..5713d84932
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Refactor\sthe\ssqlite3ExprCodeIN()\sroutine\sfor\simproved\smaintainability.
- D 2016-08-25T21:14:34.728
 -C Fix\sthe\ssqlite3_trace_v2()\sinterface\sso\sthat\sit\sgoes\sdisabled\sif\seither\sthe\ncallback\sor\smask\sarguments\sare\szero,\sin\saccordance\swith\sthe\sdocumentation.
 -D 2016-08-25T22:06:37.897
++C Merge\srecent\schanges\sfrom\strunk.
++D 2016-08-25T22:31:44.503
  F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
+ F Makefile.msc 5017381e4853b1472e01d5bb926be1268eba429c
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 25e2e333adeff5965520bc8db999c658898c972d
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -385,12 -384,12 +385,12 @@@ F src/printf.c a5f0ca08ddede803c241266a
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c d67b9a5cc33339256e2088c5a722745fc2ff5219
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 -F src/select.c fda7fd24b4d8e75479ae581329db0a0b0bf76633
 +F src/select.c cf90abce32567023c940ecabf5707c4714c61c92
  F src/shell.c 79dda477be6c96eba6e952a934957ad36f87acc7
- F src/sqlite.h.in 0f7580280d1b009b507d8beec1ff0f197ba0cc99
+ F src/sqlite.h.in 4a030e254e204570444b34bf7d40fb4a5416089e
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
 -F src/sqliteInt.h 153099746007418dfa03a99c8355c8d47b0a1cc9
 +F src/sqliteInt.h db8aa0c875b1a3cdb26e1cee47662c30a34882fd
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -1521,7 -1511,7 +1521,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 f474aeac4fa62d87e73189868d7c7a295ffb7265
- R 015c67366edd8d396f4d5202834c4796
 -P 77f7c31a3aa44798cfa5f557242caffb593ce7af
 -R e30f608edda41eef799f7d696f256071
++P b56705ae6374db9db82613ef89faa1a1e6b00a18 37e6c54b1afc634844026b3fe874dd2d550c6558
++R 2a905e6de196a1adbfb5e3026f93f057
  U drh
- Z ec6ee7d7de4c92376a0d667aef9d24cc
 -Z 8b647e4b12a24ec47b73225bc510e869
++Z 71128db26f4e518aa8ba75a034627d25
diff --cc manifest.uuid
index b8c92ac025,3d13389a96..d27311b40f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b56705ae6374db9db82613ef89faa1a1e6b00a18
 -37e6c54b1afc634844026b3fe874dd2d550c6558
++5789aab8ef59ae1cdfdae123b078ee03da6e08ed