From: drh <drh@noemail.net>
Date: Fri, 15 Aug 2014 16:10:41 +0000 (+0000)
Subject: Merge the 3.8.6 changes into the apple-osx branch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c68302a1aab2ee8f5c8076b776ec8c2c9ad32d2;p=thirdparty%2Fsqlite.git

Merge the 3.8.6 changes into the apple-osx branch.

FossilOrigin-Name: b91fcb3b1b6d383e023bd0818a2075018fd33b98
---

1c68302a1aab2ee8f5c8076b776ec8c2c9ad32d2
diff --cc manifest
index f8018cc7f5,28b547a053..91444f52b7
--- a/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\sthe\spre-3.8.6\schanges\sfrom\strunk\sinto\sthe\sapple-osx\sbranch.
- D 2014-08-14T13:39:49.761
 -C Version\s3.8.6
 -D 2014-08-15T11:46:33.931
++C Merge\sthe\s3.8.6\schanges\sinto\sthe\sapple-osx\sbranch.
++D 2014-08-15T16:10:41.678
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 +F Makefile.in c1a047f376270fb6f201ca44640b43e690bc3db0
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc 5b04e657cf08a9ac7fc47d876c5c8be962c47d6b
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
@@@ -170,7 -167,7 +170,7 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c cc753a6219d420e15f776905fdbbf8abd8b42e14
 -F src/btree.c fa057e30794bfd867963b44a3a42710a45c335a1
++F src/btree.c 7d780ca1211169b7b705a54f666d9c58a75d8e2f
  F src/btree.h 4245a349bfe09611d7ff887dbc3a80cee8b7955a
  F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3
  F src/build.c 5abf794fe8a605f2005b422e98a3cedad9b9ef5b
@@@ -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 b2e01080cce405de2bba7a5294001f9cc463a3c4 13a2d90a2869c53b79754de39045bbbdbc7688e3
- R db4ff9fa49b206f34cb01052bc7831eb
 -P 3f45b8192dad7fb1f027cbaa694046e3c1b3e278
 -R be8bb3bca247e348b90f7388fee24972
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.8.6 *
++P 08058df3af18d28c3fbd306527734f507c06f156 9491ba7d738528f168657adb43a198238abde19e
++R 25b75c2b2deb7dc6064c599b41cbb415
  U drh
- Z 38e0ab5281238789a23f83493f5517d9
 -Z 74d8dd4d4aac0ae87245b4bcefd8b172
++Z 9f710fff5c282a7578b97b13a967f77e
diff --cc manifest.uuid
index 8f472c8c1f,01b81a4804..ee2f18c66c
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 08058df3af18d28c3fbd306527734f507c06f156
 -9491ba7d738528f168657adb43a198238abde19e
++b91fcb3b1b6d383e023bd0818a2075018fd33b98