Merge updates from trunk.

FossilOrigin-Name: 9d6860098f96efc7ea60e2d6116fb7d0e2685a55

diff --cc manifest
index 99343dbe57a9817c39872e9bbef067f4a5532483,183ea44fcb3cf14553e4589935aee9787cf44464..e9f6e2333f471356ef2ad8278aece78b4487f19e
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Several\smodifications\sto\sthe\suse\sof\sthe\sMAX_PATH\smacro\son\sWindows\sto\simprove\sconsistency.
- D 2013-08-24T23:55:01.356
 -C Fix\sfor\sbuilds\swith\sboth\sSQLITE_OMIT_WAL\sand\sSQLITE_MAX_MMAP_SIZE=0\sdefined.
 -D 2013-08-26T14:30:25.813
++C Merge\supdates\sfrom\strunk.
++D 2013-08-26T19:36:18.286
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -202,8 -202,8 +202,8 @@@ F src/notify.c 976dd0f6171d4588e89e874f
  F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be
  F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
- F src/os_unix.c 44a2b26acd3f3f3a0b5d8495af945cec70a9e9df
 -F src/os_unix.c 6005be1c24797520cd5671463e1c735d197e6e83
 -F src/os_win.c 1d84f2079d9b91f91a4b5dbfa5e08f1b1a0ed0ff
++F src/os_unix.c c27a14a05061e4e690bd3949dc0246bda35e399d
 +F src/os_win.c 339cdb887654f805a3e7225dd67f210cd5c831d3
  F src/pager.c 2aa4444ffe86e9282d03bc349a4a5e49bd77c0e8
  F src/pager.h f094af9f6ececfaa8a1e93876905a4f34233fb0c
  F src/parse.y 27c6b4138497d6f8360ba7847da6ed48033f957f
@@@ -1105,7 -1105,7 +1105,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 25b029d8f32440a94ef8af45153423f6702d7431
- R 43a5201efd5c79e69d4099d70d2d8790
 -P f64cd21e2e23ed7cff48f7dafa5e76adde9321c2
 -R 2c7ed4c326daab71e6477ad6fcbe3595
 -U dan
 -Z 1fc299d2108dcbca170e4fd8db67c42b
++P bda4c47df8e80b4cc9e8aac8fd74482869f96107 edd5dbdc3239fc88799b822941603fcc828ecbb6
++R f8b228db3f91433cfd67191a80e72ad7
 +U mistachkin
- Z 68ffb990c84dd84cc8ba4e540d45c8d3
++Z d72989ebb46558e2aa62256a6f0f9391

diff --cc manifest.uuid
index ad42030f96bae53d7b756288d86a591488d15a99,a436785de31d6b0ad1b284dfd5884d12d868a720..ed4f6aa8e864828c7c35aa5f14db1e0a84413749
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- bda4c47df8e80b4cc9e8aac8fd74482869f96107
 -edd5dbdc3239fc88799b822941603fcc828ecbb6
++9d6860098f96efc7ea60e2d6116fb7d0e2685a55

diff --cc src/os_unix.c
Simple merge