From: dan <dan@noemail.net>
Date: Wed, 1 Apr 2015 18:22:26 +0000 (+0000)
Subject: Merge latest trunk changes with this branch.
X-Git-Tag: version-3.8.10~152^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49e24da9e7262e315fe58569c7f3345af0e04a1c;p=thirdparty%2Fsqlite.git

Merge latest trunk changes with this branch.

FossilOrigin-Name: 4621b2eef8be6d944f87de097bd11c649fe43333
---

49e24da9e7262e315fe58569c7f3345af0e04a1c
diff --cc manifest
index 16584352e7,83880531e8..8108693bf7
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C When\svacuuming\san\sindex\sthat\suses\sno\scollations\sother\sthan\sBINARY,\sassume\sthat\sthe\sorder\sof\sindex\sentries\swill\snot\sbe\schanged\sby\sthe\sVACUUM.
- D 2015-04-01T18:20:25.537
 -C Improved\sdetection\sand\ssuppression\sof\sendless\sloops\sin\sclearDatabasePage().
 -D 2015-04-01T13:21:33.901
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2015-04-01T18:22:26.384
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
+ F Makefile.in 00d12636df7a5b08af09116bcd6c7bfd49b8b3b4
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 3481e2dd260968742c715542db178c2bdd5db99f
+ F Makefile.msc a8d817fa486d8c88dfbd19ae6a6567d9d350de39
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION 319eb1ced4b4d17a67730f2b7b85f15c1346cb60
@@@ -173,10 -173,10 +173,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c 4f305e554d7d207375c3e29ab0335bd5a473a125
+ F src/btree.c 2caf598165f3608fde8abac2b243826616ce54b7
  F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
- F src/btreeInt.h 2bfefc01875d8da066504c233ec259fcb3b2ef72
+ F src/btreeInt.h 973a22a6fd61350b454ad614832b1f0a5e25a1e4
 -F src/build.c 0419bba592c22f6d00e6d57a2ca7136720d02c1a
 +F src/build.c 9103f5cd8f4071dc0c44a3312956e53f5b7f52c8
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c 198a0066ba60ab06fc00fba1998d870a4d575463
  F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
@@@ -235,7 -235,7 +235,7 @@@ F src/shell.c 84a1593bd86aaa14f4da8a8f9
  F src/sqlite.h.in 278602140d49575e8708e643161f4263e428a02a
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h df0ee3545220b8687d8640d433d1417b31e1675a
 -F src/sqliteInt.h d02d2b85cb02a38bc442cf9302ec8209baf6771d
++F src/sqliteInt.h c0437537f4e69993a923cb0a4e74542a4d128784
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -292,15 -292,15 +292,15 @@@ F src/trigger.c 25571661fdeae8c7f975ff4
  F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
 -F src/vacuum.c 9460b9de7b2d4e34b0d374894aa6c8a0632be8ec
 -F src/vdbe.c 86ae6f4774410868af41bd839b72b7081ff03e78
 -F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
 +F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c a9d916abb1e22355a81b0e72040917ba33c87ed7
++F src/vdbe.c f6647e7426b70826a03e69bd295d18c93ff5ae07
 +F src/vdbe.h 7e538ecf47dccb307ea2d087c3ddc2dd8d70e79d
  F src/vdbeInt.h 9cbaa84f53ddd2d09a0cf61a94337a3a035d08a0
  F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
 -F src/vdbeaux.c 413dc496248ac18eb0c19e35e86bb1ffd47b8907
 +F src/vdbeaux.c a20504ae52392459fa08402fda3f195f19d7c79d
  F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
  F src/vdbemem.c c0dc81285b7571b0a31c40f17846fe2397ec1cd9
 -F src/vdbesort.c 919717d7599fa31d343ec28bffd0f9e91a4ff5f6
 +F src/vdbesort.c 7b3684665ea51d642b0e664fa4d0b0d08d61d80c
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c 62d49237bd8f3be4863815a39387b0f9897fa5e1
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
@@@ -1247,7 -1248,7 +1248,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 592cdc5d7254be7032aa9c0b03405a74ca060b51
- R d93391642538d3e00eae6a1c718cf53f
 -P a828e73dc1ae50189bdf73f60caeb7308738ad7a
 -R 9ae26e7b05df4833a239ec9186729882
 -U drh
 -Z b113a7338e765a6278a4e0ffd57f1cf8
++P e403460b96814ac8cb976d58b27939b3bd3c61f9 30011ad2f55cfcacaf23a58ebcc17b17a7b9355e
++R 768d1278a2c7aae9e472dc5791f2f6a1
 +U dan
- Z 6ea2b15ffbb091b1ac11e4173c1e9ec7
++Z 2045741c9810a18232145862154fc073
diff --cc manifest.uuid
index 180597c5c9,925ee38b4d..a5a195f19f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e403460b96814ac8cb976d58b27939b3bd3c61f9
 -30011ad2f55cfcacaf23a58ebcc17b17a7b9355e
++4621b2eef8be6d944f87de097bd11c649fe43333