From: dan <dan@noemail.net>
Date: Wed, 21 Jan 2015 17:20:21 +0000 (+0000)
Subject: Merge trunk changes with this branch.
X-Git-Tag: version-3.8.11~114^2~99
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ca51820ca116e2282b98a77adca96912abb98c2;p=thirdparty%2Fsqlite.git

Merge trunk changes with this branch.

FossilOrigin-Name: f8699a1a3b0f3bb612aff87a2729f912d709c534
---

2ca51820ca116e2282b98a77adca96912abb98c2
diff --cc manifest
index 5aa435069e,71f218ff4a..5beacde35d
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sfurther\stests\sfor\sfts5\sbackend.
- D 2015-01-21T16:10:59.815
 -C Fix\san\sassert()\sthat\smay\sfail\sfollowing\san\sOOM\serror.
 -D 2015-01-21T17:00:57.118
++C Merge\strunk\schanges\swith\sthis\sbranch.
++D 2015-01-21T17:20:21.383
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5407a688f4d77a05c18a8142be8ae5a2829dd610
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -765,9 -721,9 +765,9 @@@ F test/mallocG.test 0ff91b65c50bdaba680
  F test/mallocH.test 79b65aed612c9b3ed2dcdaa727c85895fd1bfbdb
  F test/mallocI.test a88c2b9627c8506bf4703d8397420043a786cdb6
  F test/mallocJ.test b5d1839da331d96223e5f458856f8ffe1366f62e
- F test/mallocK.test 3cff7c0f64735f6883bacdd294e45a6ed5714817
+ F test/mallocK.test 223cc80c870c80d4a9c2014e94133efdf0123f82
  F test/mallocL.test 252ddc7eb4fbf75364eab17b938816085ff1fc17
 -F test/malloc_common.tcl 3663f9001ce3e29bbaa9677ffe15cd468e3ec7e3
 +F test/malloc_common.tcl a644f12e2da20ddfabb8bd077ec610a44113450e
  F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e
  F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
  F test/memdb.test fcb5297b321b562084fc79d64d5a12a1cd2b639b
@@@ -1282,7 -1237,7 +1282,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 b3348b1e07e168b156636a29fc8c6d6afb3129c2
- R 7d4ce350ba9859353b62d149a7c21faf
 -P 78c2e62bb4c529595aaaf2e1f5f26387ad977b1b
 -R fadddb94e3f078ed8e5664ef5ad11fc1
++P 09dabb3b9e140eec6cfda83bcb86b6b9f5cf54b6 5f592359d6d41708da3b3ac9d987a1631bfa3d88
++R 8c898c775e75cc6f7d7e1cf6ea13418f
  U dan
- Z 7c0fe174f4df11b7c7390d0e1d1bdddb
 -Z 211832fccf702756128a6ea4845193da
++Z fd361ca13b44b2a851b6664735786aee
diff --cc manifest.uuid
index 1d83cad7d6,dfb1a44e74..eb23626a44
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 09dabb3b9e140eec6cfda83bcb86b6b9f5cf54b6
 -5f592359d6d41708da3b3ac9d987a1631bfa3d88
++f8699a1a3b0f3bb612aff87a2729f912d709c534