From: drh <drh@noemail.net>
Date: Wed, 1 Apr 2015 16:39:06 +0000 (+0000)
Subject: Merge recent enhancements from trunk.
X-Git-Tag: version-3.13.0~148^2~76
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=edb3e433ba556cb322e1a967080d2a5b7b16f9b3;p=thirdparty%2Fsqlite.git

Merge recent enhancements from trunk.

FossilOrigin-Name: aea439bdc6d4d3a8568423171abf381843188826
---

edb3e433ba556cb322e1a967080d2a5b7b16f9b3
diff --cc manifest
index 30127bd0ff,83880531e8..b591f4846d
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sall\srecent\strunk\senhancements\sand\sfixes\sinto\sthe\ssessions\sbranch.
- D 2015-03-31T00:10:21.692
 -C Improved\sdetection\sand\ssuppression\sof\sendless\sloops\sin\sclearDatabasePage().
 -D 2015-04-01T13:21:33.901
++C Merge\srecent\senhancements\sfrom\strunk.
++D 2015-04-01T16:39:06.530
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 1bf4de5d0809e0ed046d6f2671ea46d1d6c69608
 -F Makefile.in 00d12636df7a5b08af09116bcd6c7bfd49b8b3b4
++F Makefile.in 3083cf0c2bc6618e532b9478ce735bb512322985
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc da7e7ac0949d78930b7b0adc3862aef9a9439b2e
 -F Makefile.msc a8d817fa486d8c88dfbd19ae6a6567d9d350de39
++F Makefile.msc ffb3a33f21fcc6f7d4b0cc76a981f62f17c62b24
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION 319eb1ced4b4d17a67730f2b7b85f15c1346cb60
@@@ -169,7 -152,7 +169,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 758bb6ffbe5fbfe676c150dd1c3332eba8f42135
 -F main.mk 997eee18387a3e69394f2f948c9c6ccf079655a4
++F main.mk 3876195fb0d4a873f643a3ee8ae4dc29b7bbb96b
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -310,13 -293,13 +310,13 @@@ F src/update.c d207deb7a031f698104bee87
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
  F src/vacuum.c 9460b9de7b2d4e34b0d374894aa6c8a0632be8ec
- F src/vdbe.c 334c39a26214270555f4b5f9ba490aaf9a9e2601
 -F src/vdbe.c 86ae6f4774410868af41bd839b72b7081ff03e78
 -F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
 -F src/vdbeInt.h 9cbaa84f53ddd2d09a0cf61a94337a3a035d08a0
 -F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
 -F src/vdbeaux.c 413dc496248ac18eb0c19e35e86bb1ffd47b8907
 -F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
 -F src/vdbemem.c c0dc81285b7571b0a31c40f17846fe2397ec1cd9
++F src/vdbe.c 503f4f9396e1109bc9ff0fa6ee01c58e12bc782b
 +F src/vdbe.h b434bb75fbec973d18d49225a59833ae39ee2afc
 +F src/vdbeInt.h 96e4303a96c6f983e36e1fe32657b2c547f5c8f1
 +F src/vdbeapi.c d95f2bb43d01a91d93231cde181811b38182202e
 +F src/vdbeaux.c 3f36b184dbb5ca87b30c7c616d7cef6eb9e74ed6
 +F src/vdbeblob.c ab33f9b57cfce7dddb23853090186da614be4846
 +F src/vdbemem.c 149e585645c3f3ef063f2b7251646388cfe3d47d
  F src/vdbesort.c 919717d7599fa31d343ec28bffd0f9e91a4ff5f6
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c 62d49237bd8f3be4863815a39387b0f9897fa5e1
@@@ -1266,7 -1248,7 +1266,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 54aaa6f29ad1bf84148c2403eed77e8311f68d66 395bb3e677a6551b06ba96fc58c393132b93d1e8
- R 5157faacf9bba75d7e337c0159334ea0
 -P a828e73dc1ae50189bdf73f60caeb7308738ad7a
 -R 9ae26e7b05df4833a239ec9186729882
++P df94e61f93da390cb75c48975c50e9d62096ea0b 30011ad2f55cfcacaf23a58ebcc17b17a7b9355e
++R 04f33d7b68cc1c223f924b4251ca247b
  U drh
- Z 1371361ad4cf3707e5f673fcbbe81867
 -Z b113a7338e765a6278a4e0ffd57f1cf8
++Z 60b6a96a3758bc5b32bc62eb74cab985
diff --cc manifest.uuid
index 5b1dd1a687,925ee38b4d..bc291e8b17
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- df94e61f93da390cb75c48975c50e9d62096ea0b
 -30011ad2f55cfcacaf23a58ebcc17b17a7b9355e
++aea439bdc6d4d3a8568423171abf381843188826