From: dan <dan@noemail.net>
Date: Sat, 21 Mar 2015 15:04:27 +0000 (+0000)
Subject: Merge latest trunk changes with this branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d019871aed10c7985ed5e3a0ca979723855ce42c;p=thirdparty%2Fsqlite.git

Merge latest trunk changes with this branch.

FossilOrigin-Name: 9affe7f3f9ccb4fd93d428d6c1c2370b09ad0383
---

d019871aed10c7985ed5e3a0ca979723855ce42c
diff --cc manifest
index c2661fb282,75771530bb..d872daac6a
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\srecent\strunk\schanges\swith\sthis\sbranch.
- D 2015-03-21T07:16:44.774
 -C Remove\san\sunreachable\sbranch\sfrom\sthe\sOP_VCreate\sopcode\s(merge\saccidental\sfork\sin\strunk).
 -D 2015-03-21T12:25:23.115
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2015-03-21T15:04:27.266
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -293,7 -293,7 +293,7 @@@ F src/update.c 250cefb96cfc7ca8f86f92ec
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
  F src/vacuum.c 9460b9de7b2d4e34b0d374894aa6c8a0632be8ec
- F src/vdbe.c 5d5bde8657b9089d142e0041619ed749955bde27
 -F src/vdbe.c bd793ed436edccaf264ec969ac92c9b5f4b41d64
++F src/vdbe.c 9976deedc3f702d61a63da6d7b4da4eacbf0afd8
  F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
  F src/vdbeInt.h bb56fd199d8af1a2c1b9639ee2f70724b4338e3a
  F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
@@@ -1247,7 -1246,7 +1247,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 d42159429735c4a03f1d66887135487a9513ea29 b11d1793a06a44931edcbf12a615b49794d53a62
- R d229891901eb87b77ad2c3e9034c0c37
 -P e3e234649616f20610abce9ae9da1c572d3a4377 5fca41a3811766b48f5f23d5d49cc4e6e79fa867
 -R f330fb6722b7e402dae00a81353077df
++P 35eef4ddd5010b869ed6daa5017caebc79d0b3fa 2fbfec62fc03d42ee240dfefaa0aeb59a3f04d88
++R 6b7e0c7643d731f810248dc56d58f871
  U dan
- Z 0bffe6be55c6357a0c14257a386bd69c
 -Z 1c256b7cca05bea8c4676944e04ddeb4
++Z 81495d62ecfb654e978235107e1dfeb1
diff --cc manifest.uuid
index 3ccbe3a9fc,d71396b19d..3a9d98c13a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 35eef4ddd5010b869ed6daa5017caebc79d0b3fa
 -2fbfec62fc03d42ee240dfefaa0aeb59a3f04d88
++9affe7f3f9ccb4fd93d428d6c1c2370b09ad0383