From: dan <dan@noemail.net>
Date: Wed, 22 Oct 2014 18:42:31 +0000 (+0000)
Subject: Merge latest trunk with this branch.
X-Git-Tag: version-3.8.8~221^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc8490d2cdf235cfd30fc74b16de916c4d34feab;p=thirdparty%2Fsqlite.git

Merge latest trunk with this branch.

FossilOrigin-Name: 854a54c6c21e800b0cd999023014813f7c50b23f
---

cc8490d2cdf235cfd30fc74b16de916c4d34feab
diff --cc manifest
index 347e58fbc2,8290b14522..396fe366d0
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\ssome\scode\sduplication\sissues\son\sthis\sbranch.\sAdd\sminor\soptimizations\sto\sthe\snew\scode.
- D 2014-10-14T17:27:04.829
 -C Take\ssteps\sto\savoid\smisestimating\srange\squery\scosts\sbased\son\sSTAT4\sdata\ndue\sto\sthe\sroundoff\serror\sof\sconverting\sfrom\sintegers\sto\sLogEst\sand\sback\nto\sintegers.
 -D 2014-10-22T15:27:05.734
++C Merge\slatest\strunk\swith\sthis\sbranch.
++D 2014-10-22T18:42:31.680
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -172,9 -172,9 +172,9 @@@ F src/auth.c d8abcde53426275dab6243b441
  F src/backup.c a31809c65623cc41849b94d368917f8bb66e6a7e
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
- F src/btree.c 3c72c5aa96b1a06ea15da24b82c526e6f14010ab
 -F src/btree.c 1b1123cba0c65caa0baa51e71b8c089e3167c3ed
++F src/btree.c 37229f3134416f24828af823a3a6f8535923d45b
  F src/btree.h a79aa6a71e7f1055f01052b7f821bd1c2dce95c8
- F src/btreeInt.h 1bd7957161a1346a914f1f09231610e777a8e58d
+ F src/btreeInt.h 026d0129724e8f265fdc60d44ec240cf5a4e6179
  F src/build.c 9dc2bd94347b878c89627000c92b0c8d97ec2919
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c 535183afb3c75628b78ce82612931ac7cdf26f14
@@@ -213,10 -213,10 +213,10 @@@ F src/os.h 3e57a24e2794a94d3cf2342c6d9a
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
  F src/os_unix.c fb587121840f690101336879adfa6d0b2cd0e8c7
- F src/os_win.c 0a4042ef35f322e86fa01f6c8884c5e645b911e7
+ F src/os_win.c a019caaae2bcbbc0cc4c39af6e7d7e43d8426053
  F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
- F src/pager.c 492aab0f963ddd7b6795de6376a38b139c767919
 -F src/pager.c a98547ad9b1b5dbbc5e7d1c520be041b5d2c0926
 -F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
++F src/pager.c 18be49e363106bdb4c982fa27dbee7a8cd297113
 +F src/pager.h 8b6707cb32c788cf36bfc3d63f6d4b4fa689e7c2
  F src/parse.y 5dfead8aed90cb0c7c1115898ee2266804daff45
  F src/pcache.c 4121a0571c18581ee9f82f086d5e2030051ebd6a
  F src/pcache.h 9b559127b83f84ff76d735c8262f04853be0c59a
@@@ -1204,7 -1205,7 +1205,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 d5b7c5a88dd58de85b3060a1f28b6d96e6e21207
- R ff1ec1f8aba483920a0100e96e95dccf
 -P 3e922208b68563489c7766abb9afb4885113e7b8
 -R 5c508733aebac553de79291a7eabd709
 -U drh
 -Z a3d7104c7f173585d7e788d6453aa065
++P 58d7793bd5d608ba9fc3a2cd44b9d9512e0332ba 3c933bf95f291f7957580d823dce92c981375a5c
++R 738ce949461e4c95ef4d450eb06d976a
 +U dan
- Z 9c750816a0b42cc370356f0c03af45ae
++Z 1bc59f5d05ced43bcf6fa4690adf0fcc
diff --cc manifest.uuid
index 065d26bf44,b84af28cee..b48e7f9fc1
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 58d7793bd5d608ba9fc3a2cd44b9d9512e0332ba
 -3c933bf95f291f7957580d823dce92c981375a5c
++854a54c6c21e800b0cd999023014813f7c50b23f