From: dan <dan@noemail.net>
Date: Wed, 15 Oct 2014 19:37:13 +0000 (+0000)
Subject: Merge latest trunk changes with this branch.
X-Git-Tag: version-3.13.0~148^2~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f11b256b0bad2e843f4df0205bd7093f632aa38d;p=thirdparty%2Fsqlite.git

Merge latest trunk changes with this branch.

FossilOrigin-Name: 1b2824f1d11ac336779372e322aecfb36fb2a31d
---

f11b256b0bad2e843f4df0205bd7093f632aa38d
diff --cc manifest
index 5d12a420df,d416b82e23..9b98ed7c5f
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\srecent\strunk\smicro-optimizations\sand\sthe\sDESC\sindex\sGROUP\sBY\sORDER\sBY\nbug\sfix\sinto\sthe\ssessions\sbranch.
- D 2014-10-14T13:41:32.002
 -C Update\sreleasetest.tcl\sso\sthat\sx86-64\sruns\sa\ssuperset\sof\sthe\sx86\stests.
 -D 2014-10-15T15:28:27.041
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2014-10-15T19:37:13.299
  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
@@@ -305,16 -289,16 +305,16 @@@ F src/update.c b9e5295d3a78e96b7c2978c4
  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 1731e1db2b71e62243cf825b920d14adefaba3c7
++F src/vdbemem.c 96e41193b4affd9ebc0eea2fa628879dac88c744
  F src/vdbesort.c 5c1bacf90578d22b630fbf6ed98ccf60d83435ef
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
- F src/vtab.c 019dbfd0406a7447c990e1f7bd1dfcdb8895697f
+ F src/vtab.c cb0c194303fea276b48d7d4b6d970b5a96bde8de
  F src/wal.c 10e7de7ce90865a68153f001a61f1d985cd17983
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
@@@ -1221,7 -1204,7 +1221,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 abfef254721ca29b653f24bfe80e88adaa92dc6c 005e5b388a8a97bca6d1f0e06c40d68d92aa1212
- R 97eb4d72b7b8377fe0610a9bf4a72e27
- U drh
- Z 615445a8ed5827e2422bf5308f655db8
 -P b3e7b446bdb47cf9d7fe43dc37e3b4f8010ee09e
 -R d10aa2fd16b5624d36b7172d8913c506
++P 83d4114f2aa404e670ced33511183baacd813a01 3c1e70f4d55bc009ed9ed4cf6d756d7061985851
++R 573bb7e03bcfc05e0f889e571f4f3aa7
+ U dan
 -Z 50710860f359ce0bbdbe754b3e261318
++Z d7531a3919881ed86fbddd665aff411c
diff --cc manifest.uuid
index 7ff55810bf,5726fd827b..1d5dadfa49
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 83d4114f2aa404e670ced33511183baacd813a01
 -3c1e70f4d55bc009ed9ed4cf6d756d7061985851
++1b2824f1d11ac336779372e322aecfb36fb2a31d