From: drh <drh@noemail.net>
Date: Mon, 25 May 2015 19:37:17 +0000 (+0000)
Subject: Merge the btree fixes out of trunk.
X-Git-Tag: version-3.8.11~220^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b335d12df792710ae16323d240fd6e616de09a7f;p=thirdparty%2Fsqlite.git

Merge the btree fixes out of trunk.

FossilOrigin-Name: f3cd8cecf4f7aa3429e3ebc90ed31c4e8fff7bc2
---

b335d12df792710ae16323d240fd6e616de09a7f
diff --cc manifest
index d13c0d5c96,bf3cc78749..cbb1b578a0
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sthe\s--dbid\sand\s--sqlid\sparameters\sto\sfuzzcheck.\s\sOther\sfuzzcheck\sfixes.
- D 2015-05-25T19:35:42.936
 -C Have\sthe\sb-tree\slayer\sreturn\sSQLITE_CORRUPT\sto\sany\sattempt\sto\sopen\sa\scursor\swith\sa\sroot\spage\snumber\sless\sthan\s1.
 -D 2015-05-25T19:24:36.961
++C Merge\sthe\sbtree\sfixes\sout\sof\strunk.
++D 2015-05-25T19:37:17.641
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 0a6ae26396ec696221021780dffbb894ff3cead7
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1279,7 -1278,7 +1279,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 c5b4e363528aa1d2d5f41451f16de0aa91152b38
- R df1cffb558a450a54d1765e42395b4a9
 -P 8fa0937a2f3476dd280259e252d6f422c33d38ee
 -R 1745897e1e5c334cb77f7423f9fe4000
 -U dan
 -Z 702c8f83eb7e3fb57102175733730dbd
++P 75ec9299faca8ce3d49d825ba6ea60588a91d113 aa18c8e9d1676b1caa53bc5f5c1dc5f201089b88
++R c7aca3d20b244db420c1462dc5cead3b
 +U drh
- Z 2a52604473d276af6452030585c0eebc
++Z 4da0e8ead0aba6b030c4a4298009f78b
diff --cc manifest.uuid
index 1eb9d85812,988034ee1f..37913cfcf4
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 75ec9299faca8ce3d49d825ba6ea60588a91d113
 -aa18c8e9d1676b1caa53bc5f5c1dc5f201089b88
++f3cd8cecf4f7aa3429e3ebc90ed31c4e8fff7bc2