From: dan <dan@noemail.net>
Date: Tue, 19 May 2015 14:14:57 +0000 (+0000)
Subject: Merge latest trunk changes with this branch.
X-Git-Tag: version-3.8.11~252^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b387e6370735138759d808d215c1f9b3ddf44187;p=thirdparty%2Fsqlite.git

Merge latest trunk changes with this branch.

FossilOrigin-Name: 6055a6725cb24469c10de9a04f3614dcc79193c6
---

b387e6370735138759d808d215c1f9b3ddf44187
diff --cc manifest
index a6b879d5f9,6244204eab..cb3bd699a7
--- a/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\schanges\sfrom\sthe\sindex-is-operator\sbranch\sinto\sthis\sone.\sDrop\sthe\spartial\ssupport\sadded\sfor\sIS\son\sthis\sbranch\sby\s[52e73eec].
- D 2015-05-14T09:53:17.998
 -C Transitive\sconstraints\sshould\sonly\swork\sif\soperands\shave\scompatible\naffinities\sand\scollating\ssequences.
 -D 2015-05-18T12:28:09.009
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2015-05-19T14:14:57.988
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in edfc69769e613a6359c42c06ea1d42c3bece1736
 +F Makefile.in 0a6ae26396ec696221021780dffbb894ff3cead7
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc a9fd7fd02265aa5b3b2522f5e39d975972ff906d
+ F Makefile.msc f9da80e91c8f953f7517c979a1540ef8af1b386f
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
- F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
- F VERSION 8af05c43e00f7de32be74ff9984d792c96cdb0de
+ F README.md 0bfccb18927349653c09137a458b961fa8ab4cb9
+ F VERSION ce0ae95abd7121c534f6917c1c8f2b70d9acd4db
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -250,12 -231,12 +250,12 @@@ F src/printf.c 13ce37e5574f9b0682fa86db
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 99eabf7eff0bfa65b75939b46caa82e2b2133f28
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 1b0bfc7d59e48c26b895a6b719157111a617d9e3
+ F src/select.c 6d9d6ae899acb9bf148862e8cccdf16085514b26
  F src/shell.c 07dda7cd692911d2f22269953418d049f2e2c0ee
 -F src/sqlite.h.in bf3fe5eba3a5142477b8dae3cfce627c3e971455
 +F src/sqlite.h.in ad7ce501e5447f89785d6c04bb61d0514554bcd2
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h c9f77bd02f419dcc8c644c5032c42eb29069a545
+ F src/sqliteInt.h 88738d94a343000e7a5c0e295d111c4cfccb18b0
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -1278,7 -1258,8 +1278,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 299ed55c909d327826ef47e204ef1e9afd54852b 4541688b3f56f5cd3d5b299594b58c577ad633bb
- R 96734f4874808ce7aff82ba236a43ce7
 -P 9c0d80907b4dee8ee8f205c2ebdb759f5ba1d771 204e567f68e4b3e069f04ca0643c6e5db781d39f
 -R a4e8ba2aafa10a2da2324dbd46c77e5c
 -T +closed 204e567f68e4b3e069f04ca0643c6e5db781d39f
 -U drh
 -Z b4b536b620859a084b09e8398affe376
++P 16ab9cafd00ea5df7e6f75d6a6740237828b888d 5df4056448fee1c766f8f79c735ed12abdce5101
++R ca0828efa06faab3b9677740d6592df2
 +U dan
- Z 9103bcdd2c3cb4a21b9d182ff8a50bb5
++Z 5e45a187c4752901348a44d76452f100
diff --cc manifest.uuid
index 06e2671f5a,472e26ef0a..5f328a8639
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 16ab9cafd00ea5df7e6f75d6a6740237828b888d
 -5df4056448fee1c766f8f79c735ed12abdce5101
++6055a6725cb24469c10de9a04f3614dcc79193c6