From: mistachkin <mistachkin@noemail.net>
Date: Fri, 2 May 2014 21:42:31 +0000 (+0000)
Subject: Merge updates from trunk.
X-Git-Tag: version-3.8.5~58^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2FwinIoRetry;p=thirdparty%2Fsqlite.git

Merge updates from trunk.

FossilOrigin-Name: 598a3875ce98015e9a38db54bd0cb6290424c3d8
---

b91ca3851411fa60c868900273f01593be3bf587
diff --cc manifest
index 3c21b9740b,c958eec031..ea2bfbfd15
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
 -C Fix\sa\sbroken\stest\scase\sin\sfuzz.test.
 -D 2014-05-02T14:54:56.266
 +C Merge\supdates\sfrom\strunk.
- D 2014-02-27T05:47:31.452
++D 2014-05-02T21:42:31.690
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -202,11 -204,11 +204,11 @@@ F src/notify.c 976dd0f6171d4588e89e874f
  F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
  F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
- F src/os_unix.c 18f7f95dc6bcb9cf4d4a238d8e2de96611bc2ae5
- F src/os_win.c fe239cec21be60d42c94cac51ba955582ad0b6b1
- F src/pager.c 0ffa313a30ed6d061d9c6601b7b175cc50a1cab7
+ F src/os_unix.c ae4b5240af4619d711301d7992396e182585269f
 -F src/os_win.c e71678ac927d0a0fb11d993db20a9748eabf808e
++F src/os_win.c 6332165795c4b47936581af59882ad8724fd4255
+ F src/pager.c ab62a24218d87dda1be641f6c5ad291bff78fd94
  F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
- F src/parse.y 2613ca5d609c2f3d71dd297351f010bcec16e1e0
+ F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0
  F src/pcache.c d8eafac28290d4bb80332005435db44991d07fc2
  F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
  F src/pcache1.c 102e6f5a2fbc646154463eb856d1fd716867b64c
@@@ -1152,7 -1166,7 +1166,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P adba783c702b05f83e0bee3eb1bc9e40cdec3785 06c2db875e6cabd81c2a153b2fa4aba03eaed268
- R f94690be5a332aeea247f333d93644d7
 -P 3bc43594aaeee9225c0590677fcce480bedcb37b
 -R cb5319eb84ea1cdb4a55d1e33cf3d763
 -U dan
 -Z 412ddec016208716851032f358e0939e
++P ed0bfcfadc07507a38f2c2387d85515ba1eb2722 faa469355eabb2c407f24638b090725448aac37f
++R ea09ee65f031a4f810c7f319ecf812cc
 +U mistachkin
- Z 16333c5ee2b5e85c87ad8958aafcb1cf
++Z 013a05de9aa8b3332c40bebaae0b4882
diff --cc manifest.uuid
index 49c623d502,52fb89ae57..be274b35fe
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ed0bfcfadc07507a38f2c2387d85515ba1eb2722
 -faa469355eabb2c407f24638b090725448aac37f
++598a3875ce98015e9a38db54bd0cb6290424c3d8