From: mistachkin <mistachkin@noemail.net>
Date: Mon, 5 May 2014 17:45:44 +0000 (+0000)
Subject: Merge updates from trunk.
X-Git-Tag: version-3.8.5~56^2~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e56c52e1d30bdcb4cb13a6dfe239550ae0f98fa;p=thirdparty%2Fsqlite.git

Merge updates from trunk.

FossilOrigin-Name: a3cfd81339267c87db511cedf35ec209ee1f1a72
---

0e56c52e1d30bdcb4cb13a6dfe239550ae0f98fa
diff --cc manifest
index bbea0afd3a,44f5a64a12..5812e68b66
--- a/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Fix\sseveral\sheader\sfile\scomments.\s\sNo\schanges\sto\scode.
- D 2014-05-05T17:43:28.823
 -C Enhance\sthe\sWin32\sVFS\sI/O\sretry\slogic.
 -D 2014-05-02T22:39:54.345
++C Merge\supdates\sfrom\strunk.
++D 2014-05-05T17:45:44.495
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 +F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc fdacba6fb574868c71fde6db6b77789a383a4c19
 -F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
 +F Makefile.msc d1d9474b660e87a0134acd33693281883cb328b1
 +F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -199,15 -199,13 +199,15 @@@ F src/mutex.c d3b66a569368015e0fcb1ac15
  F src/mutex.h 5bc526e19dccc412b7ff04642f6fdad3fdfdabea
  F src/mutex_noop.c 7682796b7d8d39bf1c138248858efcd10c9e1553
  F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc
 -F src/mutex_w32.c 6108c88e1cb38d8fbb3534b170793815cbedbf97
 +F src/mutex_w32.c ab08c0fc54b71979370ca7c8f42fc64a9f211ebb
  F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
  F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
 -F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
 +F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 +F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
  F src/os_unix.c ae4b5240af4619d711301d7992396e182585269f
- F src/os_win.c 089fcb45dabe90a4c87369cc69846838198dd221
 -F src/os_win.c 6332165795c4b47936581af59882ad8724fd4255
++F src/os_win.c 485d06a93965f306c7281fca0937829292367234
 +F src/os_win.h ca9c83efaf41298691553e1d0f7e11328168d8b8
  F src/pager.c ab62a24218d87dda1be641f6c5ad291bff78fd94
  F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
  F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0
@@@ -1168,7 -1166,7 +1168,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 c4d1d8a0db48f523d1624f2468261c171152c0f7
- R e81e8bbcb0f41d36dce23eda3c309a85
 -P faa469355eabb2c407f24638b090725448aac37f 598a3875ce98015e9a38db54bd0cb6290424c3d8
 -R ea09ee65f031a4f810c7f319ecf812cc
++P dd6eb5d1eb4d50023a008fac116497ede29600c1 4760504396bcf44528eb8de9ed7aa5d9659c54b6
++R 938ab94058764b9d56f0ca54851e9d8f
  U mistachkin
- Z 2824130e829ad3dc4daa36d25ec17b58
 -Z f9afa829a6179e568b33b0a29e5a3328
++Z a631e563685a71a6d0be75c7b14abe5e
diff --cc manifest.uuid
index fd4cdfc69f,fea2bea1a8..7c05bb1c64
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- dd6eb5d1eb4d50023a008fac116497ede29600c1
 -4760504396bcf44528eb8de9ed7aa5d9659c54b6
++a3cfd81339267c87db511cedf35ec209ee1f1a72