From: drh <drh@noemail.net>
Date: Thu, 22 Dec 2011 02:10:57 +0000 (+0000)
Subject: Merge recent trunk changes into the statvfs branch.
X-Git-Tag: mountain-lion~8^2~21^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a7df358ab0518f0b4057093a901896dd66d5250;p=thirdparty%2Fsqlite.git

Merge recent trunk changes into the statvfs branch.

FossilOrigin-Name: 995ec8a41a7d091d9d87cb8f18f62102c8fda7d7
---

3a7df358ab0518f0b4057093a901896dd66d5250
diff --cc manifest
index d75a9a88ff,bbe5f09d73..5931a4da86
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Remove\sa\sredundant\sassignment\soperator.
- D 2011-12-22T01:46:04.520
 -C Fix\sother\sproblems\swhere\s32-bit\sinteger\soverflow\smay\scause\sa\sproblem.\sTwo\sthat\srequire\san\simprobably\slarge\ssub-journal\sand\stwo\sin\stest\sharness\scode.
 -D 2011-12-21T18:04:41.417
++C Merge\srecent\strunk\schanges\sinto\sthe\sstatvfs\sbranch.
++D 2011-12-22T02:10:57.625
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -166,9 -166,9 +166,9 @@@ F src/os.c 28bbdab2170dfce84d86c45456a1
  F src/os.h 549b1a2e5e0ed1e1499f252dac126c4973e7379c
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
 -F src/os_unix.c 7dc7df10331942b139032328449a3723e051979e
 -F src/os_win.c 197d23ce8a0dff748e766e034bf95ff756dd3884
 -F src/pager.c 523c64f6ca707e820d5cf10ed8371238ecac8333
 +F src/os_unix.c 3e630701efd54ecbdba237c5a3cb3c55d83d8a2e
 +F src/os_win.c 4fc4aa8aecb334c64a250a4b36cff6a798704da4
- F src/pager.c c9bd2f7183edba480bea1dd49361a02d0c3d8f43
++F src/pager.c fb35a2c33667dd568b8df30fc11a4516e9889057
  F src/pager.h 5cd760857707529b403837d813d86b68938d6183
  F src/parse.y fabb2e7047417d840e6fdb3ef0988a86849a08ba
  F src/pcache.c 1fdd77978c1525d1ca4b9ef48eb80abca710cb4c
@@@ -985,7 -985,7 +986,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P c83627b73285f883719845c1b9fe85f378f28dd2
- R f1e5c3d8040d152c5fcb2f4a7615b662
 -P c5256b59ad70104c1e181b9f49d1d712cf4cc9f6
 -R 67d063070f0e350ae5f59b7b697ace26
 -U dan
 -Z bef61bfcf61cf3a9e556e6b3194dc0ce
++P 19a6852a1e5905b35bc69b309951c5ec8ecd0bef c723e3e18a008922281d8d6e8e3aba07941eb173
++R 0d94bcf8f6066e5974e9f53b64f5faa2
 +U drh
- Z 2c78a3c6c37d41190b48f488942db024
++Z 112a2eaccff16ef2315b6fa4c08d4e3f
diff --cc manifest.uuid
index 6760521fcc,0d2903da39..8e76db1dc5
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 19a6852a1e5905b35bc69b309951c5ec8ecd0bef
 -c723e3e18a008922281d8d6e8e3aba07941eb173
++995ec8a41a7d091d9d87cb8f18f62102c8fda7d7