Merge latest trunk changes with this branch.

FossilOrigin-Name: 9dca7ce55797b3eb617859f6189c1a2ec6f66566

diff --cc manifest
index bb3b4e65792c409d7e3424cc979b63b33c79b3e3,bfce404357668de1b9173b714fcd82743a3810c5..9df6c3ab5dcbe9b7a3ca389761752eef1607ad01
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fixes\sto\sos_unix.c\sto\ssupport\sdatabase\s(and\sother)\sfiles\slarger\sthan\s2GiB.
- D 2014-09-06T16:49:40.555
 -C Fix\stypos\sin\scomments.\sNo\scode\schanges.
 -D 2014-09-06T16:39:46.963
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2014-09-06T16:52:18.556
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -205,35 -205,35 +205,35 @@@ F src/mutex_unix.c 1b10d5413dfc794364a8
  F src/mutex_w32.c 06bfff9a3a83b53389a51a967643db3967032e1e
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
  F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
- F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
+ F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 22225d7969b3e4d7aaef9804ea5af5d02d7abd6a
- F src/os_win.c 3c9f7df710cb6c757b04b78bf3d98f03830e67b9
 -F src/os_unix.c 576f95b5b02397044ebbcdc1027528ba1bb2d92e
++F src/os_unix.c 074879d7378638e12d4e4345cfc2f01c00a41c09
+ F src/os_win.c 0a4042ef35f322e86fa01f6c8884c5e645b911e7
  F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
- F src/pager.c 3e732d2bbdd8d8d95fed0c5ae7e718d73153c4c5
+ F src/pager.c 31da9594ad4c3b5851bb6fe1a95c33835ab7ddce
  F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
  F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0
- F src/pcache.c 3b3791297e8977002e56b4a9b8916f2039abad9b
+ F src/pcache.c 2048affdb09a04478b5fc6e64cb1083078d369be
  F src/pcache.h 9b559127b83f84ff76d735c8262f04853be0c59a
- F src/pcache1.c c5af6403a55178c9d1c09e4f77b0f9c88822762c
+ F src/pcache1.c dab8ab930d4a73b99768d881185994f34b80ecaa
  F src/pragma.c 14bcdb504128a476cce5bbc086d5226c5e46c225
  F src/prepare.c 3842c1dfc0b053458e3adcf9f6efc48e03e3fe3d
- F src/printf.c 00986c86ddfffefc2fd3c73667ff51b3b9709c74
+ F src/printf.c e74925089a85e3c9f0e315595f41c139d3d118c2
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
- F src/resolve.c 0ea356d32a5e884add23d1b9b4e8736681dd5697
- F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
- F src/select.c 89e569b263535662f54b537eb9118b2c554ae7aa
+ F src/resolve.c 0d1621e45fffe4b4396477cf46e41a84b0145ffb
+ F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
+ F src/select.c b4457526cee73c0b69fad42f799f619b1d5a8a8a
  F src/shell.c 713cef4d73c05fc8e12f4960072329d767a05d50
- F src/sqlite.h.in 43852c8b68b4c579948cb37182918078836c5c06
+ F src/sqlite.h.in 64a77f2822f1325b12050972003184f99b655a0f
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
- F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 6244ee9052752e26d1275ab20c9b774385aa57d2
+ F src/sqlite3ext.h 1f40357fb9b12a80c5a3b2b109fd249b009213d4
+ F src/sqliteInt.h 4d1b0488f097aa7be346176c4d5e3cc1e25d99da
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
- F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 7d100e2e7aad614bb3d7026a41a0e3827dbaaebc
- F src/test1.c 363a5089230a92cf0aaa7a2945da7f2bf3b0a8d3
+ F src/table.c 4e28a53e66bad8d014a510ef0205f5497c712b08
+ F src/tclsqlite.c 8d6d6833c0053f0b3b1aeb1c5c7a7eeff0ad4d3f
+ F src/test1.c 22bfe1ce9f2f3746d682093a475ec0a33e0e55d8
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -1193,10 -1193,7 +1193,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 733119067757814609a9cea6b975818607bee4e3
- R da7850c1d5c67f21c676f6a6ed44959c
- T *branch * android-large-filles
- T *sym-android-large-filles *
- T -sym-trunk *
 -P 4d4fb197dc438a486cf5d967cf435f1132902c63
 -R db0dce11ff1f08f3ef74aeb9c5ce2829
 -U peter.d.reid
 -Z 050bcae7bdbaf9a55cc282a84c1e1741
++P e7fae33c0754488336ce093189a83dfe1b818d89 e62aab5e9290503869e1f4d5e0fefd2b4dee0a69
++R 4f1c4fbf36518adadafff47a2a4e4d9c
 +U dan
- Z 5be16efe9db58eba68bedd24a6d0231c
++Z f9c1e86e1e1c4d77fdb86b6f664302fc

diff --cc manifest.uuid
index 2f4152264c704cc88d03ecf1d758ee721ed5b296,3f8f17bbced8e613d08572304451cc5e48c94000..b1d8cba871503e682b9a031dbed696d44932abe9
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e7fae33c0754488336ce093189a83dfe1b818d89
 -e62aab5e9290503869e1f4d5e0fefd2b4dee0a69
++9dca7ce55797b3eb617859f6189c1a2ec6f66566

diff --cc src/os_unix.c
Simple merge