From: drh <drh@noemail.net>
Date: Fri, 15 Aug 2014 15:46:21 +0000 (+0000)
Subject: Merge the 3.8.6 release into the threads branch.
X-Git-Tag: version-3.8.7~132^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d09dfe8f317bae964ca2e59d16d86e6594aca67;p=thirdparty%2Fsqlite.git

Merge the 3.8.6 release into the threads branch.

FossilOrigin-Name: 05807c4122505567ec64fb2d142077f48a0a10b1
---

8d09dfe8f317bae964ca2e59d16d86e6594aca67
diff --cc manifest
index f5f51417e8,28b547a053..d04b6be24b
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\spre-3.8.6\schanges\sinto\sthe\sthreads\sbranch.
- D 2014-08-14T14:02:48.852
 -C Version\s3.8.6
 -D 2014-08-15T11:46:33.931
++C Merge\sthe\s3.8.6\srelease\sinto\sthe\sthreads\sbranch.
++D 2014-08-15T15:46:21.010
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 +F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 5b04e657cf08a9ac7fc47d876c5c8be962c47d6b
 +F Makefile.msc e31dee24038965fb6269d6d61073fd6b7e331dec
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 1c877615a9db323e3cd301e3d57d853f9d5c4a07
@@@ -167,10 -167,10 +167,10 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c f3d64fe70d61b2c970b3633506ad5e7fc684c6a1
 -F src/btree.c fa057e30794bfd867963b44a3a42710a45c335a1
++F src/btree.c 691d09b5d243b0d42c071d2ad0e2476aebdeea92
  F src/btree.h 4245a349bfe09611d7ff887dbc3a80cee8b7955a
  F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3
 -F src/build.c 5abf794fe8a605f2005b422e98a3cedad9b9ef5b
 +F src/build.c 6aa8134d18fe1746b5d2885a361ee093e5145ae2
  F src/callback.c fcff28cf0df2403dd2f313bb8d1b8f31f6f3cd64
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
@@@ -1191,7 -1186,10 +1191,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 a353a8515fb2eff86042d0c33e39772f4d04e0b3 13a2d90a2869c53b79754de39045bbbdbc7688e3
- R 64b417b620c9f6c58aeb23fe611b07d3
 -P 3f45b8192dad7fb1f027cbaa694046e3c1b3e278
 -R be8bb3bca247e348b90f7388fee24972
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.8.6 *
++P a608fd1d52606a009c3acc7f1d184b86a7df3c82 9491ba7d738528f168657adb43a198238abde19e
++R 2da06d5c8da6ea94aeb00428a88d4808
  U drh
- Z b2ed58163bf8c58a60958e9dca71f3dd
 -Z 74d8dd4d4aac0ae87245b4bcefd8b172
++Z 1c5f8fe63924bc5d5031f6b27d8e1190
diff --cc manifest.uuid
index dbdc61eb7e,01b81a4804..41ae00ee76
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a608fd1d52606a009c3acc7f1d184b86a7df3c82
 -9491ba7d738528f168657adb43a198238abde19e
++05807c4122505567ec64fb2d142077f48a0a10b1