From: drh <drh@noemail.net>
Date: Fri, 17 Oct 2014 11:53:22 +0000 (+0000)
Subject: Merge all version 3.8.7 updates from trunk.
X-Git-Tag: version-3.13.0~148^2~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc2866ca7abc2ad7cbb6878d65cd18e584cff8f5;p=thirdparty%2Fsqlite.git

Merge all version 3.8.7 updates from trunk.

FossilOrigin-Name: f4de9e07be3819db222317725e62ea997cd22a20
---

bc2866ca7abc2ad7cbb6878d65cd18e584cff8f5
diff --cc manifest
index 193e5f6c38,e210943d15..c85b4471f3
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Fix\sa\sproblem\scausing\ssqlite3changeset_concat()\sto\sfail\sto\sdetect\sattempts\sto\sconcatenate\spatchsets\swhich\schangesets.
- D 2014-10-15T20:02:21.265
 -C Version\s3.8.7
 -D 2014-10-17T11:24:17.839
++C Merge\sall\sversion\s3.8.7\supdates\sfrom\strunk.
++D 2014-10-17T11:53:22.349
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 +F Makefile.in dd5f245aa8c741bc65845747203c8ce2f3fb6c83
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc e31dee24038965fb6269d6d61073fd6b7e331dec
 +F Makefile.msc 35808af7f8d999176ed5b38fb482a87a129ee3e1
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 53a0b870e7f16d3b06623c31d233a304c163a6af
@@@ -299,21 -282,21 +299,21 @@@ F src/test_thread.c 1e133a40b50e9c035b0
  F src/test_vfs.c f84075a388527892ff184988f43b69ce69b8083c
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
- F src/threads.c 60c9d400abf17ccdc8767cdc6af90b9c5acf58bd
+ F src/threads.c 6de09362b657f19ba83e5fa521ee715787ce9fee
  F src/tokenize.c cc9016e5007fc5e76789079616d2f26741bcc689
  F src/trigger.c 25571661fdeae8c7f975ff40ffec205520a3f92f
 -F src/update.c 729f6f18fc27740591d085e1172cebe311144bf0
 +F src/update.c b9e5295d3a78e96b7c2978c4f9d224d06880f031
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 4006c01772bd8d8ac4306d523bbcee41d3e392d8
  F src/vacuum.c 59f03f92bcff57faa6a8ca256eb29ccddfb0614a
 -F src/vdbe.c 5ee15a66ce07e0482b92aa29e4dd0c5827a22d79
 -F src/vdbe.h 09f5b4e3719fa454f252322b1cdab5cf1f361327
 -F src/vdbeInt.h e2a060a55ee18a6ab973353a5e2ec7ee569bf787
 -F src/vdbeapi.c 37a6c6ae284a97bcace365f2f0a225680c0499d9
 -F src/vdbeaux.c edbb7a9c8b2a8f7a68ac75c2475edd4040266b76
 -F src/vdbeblob.c 848238dc73e93e48432991bb5651bf87d865eca4
 -F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
 +F src/vdbe.c a1465183697f2a187520d13cebf6a41f3832e0c0
 +F src/vdbe.h d61daeffed696e21630759de9e135ee298ad9573
 +F src/vdbeInt.h 7254c20b45033e1194601a02f3a386e39263c0ab
 +F src/vdbeapi.c 30a1c991147fdf4334900b5fed8a312ae7678707
 +F src/vdbeaux.c 191ea23e5adbe5b6adcb9d31860b9fb890834e24
 +F src/vdbeblob.c d65b01f439df63911ac3d7a9a85c15503965f2c3
 +F src/vdbemem.c 96e41193b4affd9ebc0eea2fa628879dac88c744
- F src/vdbesort.c 5c1bacf90578d22b630fbf6ed98ccf60d83435ef
+ F src/vdbesort.c 975aeffa99acb0991b2f288d30294756bff41438
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c cb0c194303fea276b48d7d4b6d970b5a96bde8de
  F src/wal.c 10e7de7ce90865a68153f001a61f1d985cd17983
@@@ -1215,14 -1197,17 +1215,14 @@@ F tool/speedtest8inst1.c 293327bc76823f
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43
  F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d
 -F tool/symbols.sh fec58532668296d7c7dc48be9c87f75ccdb5814f
 +F tool/symbols.sh c5a617b8c61a0926747a56c65f5671ef8ac0e148
  F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
- F tool/vdbe-compress.tcl 0cf56e9263a152b84da86e75a5c0cdcdb7a47891
+ F tool/vdbe-compress.tcl 5926c71f9c12d2ab73ef35c29376e756eb68361c
  F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 1b2824f1d11ac336779372e322aecfb36fb2a31d
- R fa664b8794125d09d3da5d2babd6e792
- U dan
- Z 8d94920cff847cf3f9fcffe7f6436f08
 -P 06c576c152c4013080c255cbbeb45bf2e298be9f
 -R 76bb09f8a8f8bdebeb708f5bb39aa31b
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.8.7 *
++P 236704a9d1551a50a55bd6e0b6473191a7a7dd21 e4ab094f8afce0817f4074e823fabe59fc29ebb4
++R 94ea0ef4c36ef357c67b389bf2d7aa16
+ U drh
 -Z b2f516d1147acb0e1bf1c700327ee52e
++Z bebb5b662648007cddd6eaea9299c843
diff --cc manifest.uuid
index 4a7ff9ad2f,f4f611fe44..54e0e227d7
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 236704a9d1551a50a55bd6e0b6473191a7a7dd21
 -e4ab094f8afce0817f4074e823fabe59fc29ebb4
++f4de9e07be3819db222317725e62ea997cd22a20