From: drh <drh@noemail.net>
Date: Tue, 26 Jul 2016 15:17:14 +0000 (+0000)
Subject: Merge fixes to sqlite3_scrub_backup() from trunk.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1563c7a4d5d1815653e55a8e5332da545b69ff88;p=thirdparty%2Fsqlite.git

Merge fixes to sqlite3_scrub_backup() from trunk.

FossilOrigin-Name: 91e811f51e611a37372875e96a4c51bbed2dfdea
---

1563c7a4d5d1815653e55a8e5332da545b69ff88
diff --cc manifest
index 4703bf72e8,7f897eb954..78a7f9cda1
--- a/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Merge\sthe\scache_spill\sVACUUM\sfix\sfrom\strunk.
- D 2016-07-26T04:54:54.660
 -C Ensure\sthat\sthe\ssqlite3_scrub_backup()\sextension\screates\sa\sbackup\sdatabase\sat\sleast\sas\slarge\sas\sindicated\sby\sthe\sdatabase\sheader,\seven\sif\sthe\slast\spage\sof\sthe\sinput\sdatabase\sis\sa\sfree-list\sleaf.
 -D 2016-07-26T10:46:21.988
 -F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
++C Merge\sfixes\sto\ssqlite3_scrub_backup()\sfrom\strunk.
++D 2016-07-26T15:17:14.899
 +F Makefile.in 7ac1f34182d307765c6439c899bd3dac2af587bf
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -1512,7 -1507,7 +1512,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 0e9f534fef72ca142a4296ab5285c82aada38ba7 c0e7d98ef2a13ede5ae865083ede1aaffdf43310
- R ad16072200ab87989c8c158553871b49
 -P c0e7d98ef2a13ede5ae865083ede1aaffdf43310
 -R 783c6677056c1c6297ef166e24fadbce
 -U dan
 -Z 42a389186c57610d077ea553714cade1
++P cc6bfdf814d5701591b69ba2d399d4a1f6f6cc98 483994a54dee3c7a3801e0e9d3c96fa9dbd8d2fd
++R e217bb197896d512771b3d30716a58a1
 +U drh
- Z fa17d6f6d751fa9f56d6e973bdf235ba
++Z 0e458236bb0fbc79b94c4a82c5b8e052
diff --cc manifest.uuid
index d764d9c2c8,1e810448d2..598e716c62
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- cc6bfdf814d5701591b69ba2d399d4a1f6f6cc98
 -483994a54dee3c7a3801e0e9d3c96fa9dbd8d2fd
++91e811f51e611a37372875e96a4c51bbed2dfdea