From: drh <drh@noemail.net>
Date: Sat, 7 Feb 2015 15:30:08 +0000 (+0000)
Subject: Merge increment blob I/O fixes from trunk.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f73784941431a7572031540cc02e8dc3008b825;p=thirdparty%2Fsqlite.git

Merge increment blob I/O fixes from trunk.

FossilOrigin-Name: 292cf68b4c934c3a666d938d3857f6bd8a484044
---

3f73784941431a7572031540cc02e8dc3008b825
diff --cc manifest
index 75403b44d4,033c8ecf04..ca429ce80a
--- a/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\sall\srecent\strunk\senhancements\sinto\sthe\sapple-osx\sbranch.
- D 2015-02-06T16:03:44.885
 -C Fix\spotential\s32-bit\sinteger\soverflow\sproblems\son\sthe\soffset\sand\slength\nparameters\sto\ssqlite3_blob_read()\sand\ssqlite3_blob_write().\s\sFor\nsqlite3_blob_open(),\smake\ssure\sthe\s*ppBlob\sreturn\sparameter\sis\szeroed\sif\nthe\sinterface\sfails\swith\sSQLITE_MISUSE.
 -D 2015-02-07T15:16:35.893
++C Merge\sincrement\sblob\sI/O\sfixes\sfrom\strunk.
++D 2015-02-07T15:30:08.313
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 6b9e7677829aa94b9f30949656e27312aefb9a46
 +F Makefile.in e1f1fce0d47e29ffae67c92834d0e6e1c699743e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc fc6b0b233b5621f3e56298e4d6a0b3f6c936c520
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
@@@ -297,12 -293,12 +297,12 @@@ F src/update.c 3c4ecc282accf12d39edb8d5
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
  F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c
 -F src/vdbe.c ddfc977981cd6324668aa6b114045eb1c677421a
 +F src/vdbe.c 0fa93ce5135f2083abcb28e854be3b4b49477eac
  F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
  F src/vdbeInt.h 9bb69ff2447c34b6ccc58b34ec35b615f86ead78
 -F src/vdbeapi.c 4bc511a46b9839392ae0e90844a71dc96d9dbd71
 -F src/vdbeaux.c 97911edb61074b871ec4aa2d6bb779071643dee5
 +F src/vdbeapi.c ad6b1bde19d27ec5b278af4a8182ff60fdae5bc3
 +F src/vdbeaux.c 7069b951a45fb7eafed15bd358ae2f35356f33ad
- F src/vdbeblob.c 4af4bfb71f6df7778397b4a0ebc1879793276778
+ F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
  F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
  F src/vdbesort.c 6d64c5448b64851b99931ede980addc3af70d5e2
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
@@@ -642,8 -638,8 +642,8 @@@ F test/in3.test 3cbf58c87f4052cee3a58b3
  F test/in4.test d2b38cba404bc4320f4fe1b595b3d163f212c068
  F test/in5.test 1de657472fa9ac2924be25c2c959ac5ca1aae554
  F test/incrblob.test e81846d214f3637622620fbde7cd526781cfe328
- F test/incrblob2.test bf4d549aa4a466d7fbe3e3a3693d3861263d5600
+ F test/incrblob2.test 0d8821730a84f90af78a9dd547fe7a2480a06240
 -F test/incrblob3.test d8d036fde015d4a159cd3cbae9d29003b37227a4
 +F test/incrblob3.test 5fa6f2665ae37da05928bb16851d4f86515af78a
  F test/incrblob4.test f26502a5697893e5acea268c910f16478c2f0fab
  F test/incrblob_err.test af1f12ba60d220c9752073ff2bda2ad59e88960d
  F test/incrblobfault.test 280474078f6da9e732cd2a215d3d854969014b6e
@@@ -1244,7 -1239,7 +1244,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 518621f8dcd6c0cc107110991753731a19b263f6 0f65a7e2e09f801b66897479d501607caeae4abf
- R 694a381aaaf28d74eacd2ee4fda12681
 -P 0f65a7e2e09f801b66897479d501607caeae4abf
 -R a72e608518946b8cddba99b1913bccc8
++P 44711921fea2bb2d804d57b23872ab84156a04ba 5df02f50f8348dfde4fc15126abc7b7ef7803e69
++R bf408e4200aee94ecf190da2131a7d82
  U drh
- Z cac64b70477296f7a2a9f3e5049107a7
 -Z 826c67b7d3493617a37693ae1605b2c3
++Z bf0e591007dbe516c8487da180fde0bc
diff --cc manifest.uuid
index 328459f93c,c363eec9d9..43889d1b60
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 44711921fea2bb2d804d57b23872ab84156a04ba
 -5df02f50f8348dfde4fc15126abc7b7ef7803e69
++292cf68b4c934c3a666d938d3857f6bd8a484044