From: drh <drh@noemail.net>
Date: Fri, 4 Apr 2014 18:37:36 +0000 (+0000)
Subject: Merge the latest trunk changes into the threads branch.
X-Git-Tag: version-3.8.7~132^2~78
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=85462ed9398e9b1db97c86cf892002bcb165a2d0;p=thirdparty%2Fsqlite.git

Merge the latest trunk changes into the threads branch.

FossilOrigin-Name: 39ac79cffe716f88af0871bdd206231b6a6511ff
---

85462ed9398e9b1db97c86cf892002bcb165a2d0
diff --cc manifest
index ba8d195a88,d36a69418a..4728b7994c
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Add\stest\sfile\ssort3.test,\swhich\sshould\shave\sbeen\spart\sof\scommit\s[9d3351b8d7].
- D 2014-04-04T07:52:44.563
 -C Merge\schanges\sto\sthe\squery\splanner\sthat\sstrive\sto\sensure\sthat\sany\sindex\s\nusage\sthat\sis\sa\sproper\ssubset\sof\ssome\sother\sindex\susage\salways\shas\sa\sslightly\nhigher\scost.
 -D 2014-04-04T18:20:35.620
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sthreads\sbranch.
++D 2014-04-04T18:37:36.101
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 +F Makefile.in ad0921c4b2780d01868cf69b419a4f102308d125
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc fdacba6fb574868c71fde6db6b77789a383a4c19
 +F Makefile.msc 153eb9b9725bc7b8e4dbe963219298e0c4a644b0
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
@@@ -204,8 -204,8 +204,8 @@@ F src/os.c 1b147e4cf7cc39e618115c14a086
  F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_unix.c ae4b5240af4619d711301d7992396e182585269f
 -F src/os_win.c e71678ac927d0a0fb11d993db20a9748eabf808e
 +F src/os_win.c 8245fe9184300e641d02e29a8ca95cefe0cb0fd0
- F src/pager.c 97a8908bf4e6e7c3adea09d3597cfa48ae33ab4e
+ F src/pager.c ab62a24218d87dda1be641f6c5ad291bff78fd94
  F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
  F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0
  F src/pcache.c d8eafac28290d4bb80332005435db44991d07fc2
@@@ -1162,7 -1160,8 +1163,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 217814bc4b53fab7bdad433e24e8aef8998c38fe
- R 3decea650c26960f7b93e4d30e9eb4e6
- U dan
- Z 1dd1e90c2d62e06b6853f5bd55d6e7b2
 -P e54330b43127e46fc6494748cbb353a6fc91cfd7 7473c4dfc10a47594affa6f4e071a08dc8838c0c
 -R dcb8d4aedf5f44fc76078dc97c08f05d
 -T +closed 7473c4dfc10a47594affa6f4e071a08dc8838c0c
++P dceed2c803fca23c83c02c448d5ae7c4698efee1 683dd379a293b2f330e1e4cd746f190527fe48ee
++R ded894407cec029874d1f7230b628469
+ U drh
 -Z b9b64aa08b9101816e80a031012d4116
++Z 4f065338769b0de2d9e8b418eaae9ff0
diff --cc manifest.uuid
index b284b74278,8da78e64c3..d9a62a86f8
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- dceed2c803fca23c83c02c448d5ae7c4698efee1
 -683dd379a293b2f330e1e4cd746f190527fe48ee
++39ac79cffe716f88af0871bdd206231b6a6511ff