From: mistachkin <mistachkin@noemail.net>
Date: Thu, 27 Feb 2014 05:47:31 +0000 (+0000)
Subject: Merge updates from trunk.
X-Git-Tag: version-3.8.5~58^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=14eec74a5b8c5d00c98becbff70f5fee21f894fa;p=thirdparty%2Fsqlite.git

Merge updates from trunk.

FossilOrigin-Name: ed0bfcfadc07507a38f2c2387d85515ba1eb2722
---

14eec74a5b8c5d00c98becbff70f5fee21f894fa
diff --cc manifest
index 84d15c6531,9c72c3971c..3c21b9740b
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Enhance\sthe\sWin32\sVFS\sI/O\sretry\slogic.
- D 2014-02-18T05:18:36.863
 -C More\sefficient\sremoval\sof\sduplicates\sin\srecursive\squeries\susing\sthe\sUNION\ncompound\soperator.
 -D 2014-02-26T21:35:31.484
++C Merge\supdates\sfrom\strunk.
++D 2014-02-27T05:47:31.452
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -203,10 -203,10 +203,10 @@@ F src/os.c 1b147e4cf7cc39e618115c14a086
  F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_unix.c 18f7f95dc6bcb9cf4d4a238d8e2de96611bc2ae5
- F src/os_win.c 5c0f315a7cfb513b7151c87a0699a8ad0bc1acb2
 -F src/os_win.c c47f107fc5c9d3466c06ea4aa35822f3568e81ee
++F src/os_win.c fe239cec21be60d42c94cac51ba955582ad0b6b1
  F src/pager.c 0ffa313a30ed6d061d9c6601b7b175cc50a1cab7
  F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
- F src/parse.y cce844ccb80b5f969b04c25100c8d94338488efb
+ F src/parse.y 2613ca5d609c2f3d71dd297351f010bcec16e1e0
  F src/pcache.c d8eafac28290d4bb80332005435db44991d07fc2
  F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
  F src/pcache1.c 102e6f5a2fbc646154463eb856d1fd716867b64c
@@@ -1151,10 -1152,7 +1152,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 b92d31a97d5fe4606d9ae1393c7f3e052f46bf5a
- R 36c4c6416a0341396e2a781bd502abeb
- T *branch * winIoRetry
- T *sym-winIoRetry *
- T -sym-trunk *
 -P 9c2e7612cd137895e13ee872e668ce1216719d85
 -R 8af1befb78d550449f6afe7ccc2f524b
 -U drh
 -Z 54acbfe19bff5d9f12c833489ea306bb
++P adba783c702b05f83e0bee3eb1bc9e40cdec3785 06c2db875e6cabd81c2a153b2fa4aba03eaed268
++R f94690be5a332aeea247f333d93644d7
 +U mistachkin
- Z b9d60eef2d6576ef4d346ab00acfffd9
++Z 16333c5ee2b5e85c87ad8958aafcb1cf
diff --cc manifest.uuid
index 02a7c49e96,b0059e4d9c..49c623d502
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- adba783c702b05f83e0bee3eb1bc9e40cdec3785
 -06c2db875e6cabd81c2a153b2fa4aba03eaed268
++ed0bfcfadc07507a38f2c2387d85515ba1eb2722