Merge latest trunk change.

FossilOrigin-Name: f6d26e07b70965e332b1589804ca938593a5f432

diff --cc manifest
index f1ca3e28a6c82c4325116e3b098c36be3bc3613a,11bbba4ce741fe76a8115b285b54a4b6a221734a..7f2143caf9b00ecae725f79f94e540a3b672c313
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,5 @@@
- C Fix\sjrnlmode2.test\sso\sthat\sit\sworks\son\ssystems\swhere\sUNDELETABLE_WHEN_OPEN\sis\sdefined.
- D 2010-06-21T05:40:49
 ------BEGIN PGP SIGNED MESSAGE-----
 -Hash: SHA1
 -
 -C Fix\san\suninitialized\svariable\sin\sos_unix.c.
 -D 2010-06-19T23:53:11
++C Merge\slatest\strunk\schange.
++D 2010-06-21T06:00:16
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -154,9 -157,9 +154,9 @@@ F src/os.c 9c4a2f82a50306a33907678ec018
  F src/os.h d7775504a51e6e0d40315aa427b3e229ff9ff9ca
  F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
  F src/os_os2.c 665876d5eec7585226b0a1cf5e18098de2b2da19
- F src/os_unix.c 2555f00c4c777539c33a2ef0e65f71cff08a6fa0
 -F src/os_unix.c 838e0c0cabb722ac573c8cbd666b47bdf44eb8f9
 -F src/os_win.c dfde7d33c446e89dd9a277c036f2c4cc564b3138
 -F src/pager.c 4fe451d68950002eb985e6325d666ab54956a37f
++F src/os_unix.c 5231a75a3799872b1250bc70c0e6a1a5960bc865
 +F src/os_win.c 73608839342de32280cb378d3c2fc85a5dd80bd2
 +F src/pager.c 6ebb43239ad4ae2c0b0720bbd88a6a84a301bc8a
  F src/pager.h ca1f23c0cf137ac26f8908df2427c8b308361efd
  F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e
  F src/pcache.c 1e9aa2dbc0845b52e1b51cc39753b6d1e041cb07
@@@ -824,7 -826,14 +824,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 3e76a9f2c041a6d36614f540bb89588703d85925
- R b870a455574cea6100e536dd46b8d81b
 -P 2241788bc85fbc48e9cfecb95fe0a858338e37cb
 -R 519d2c82f8071bfeedb3eae3a50de5e0
 -U drh
 -Z fb28c7b4632831ff9010ebcbf771882d
 ------BEGIN PGP SIGNATURE-----
 -Version: GnuPG v1.4.6 (GNU/Linux)
 -
 -iD8DBQFMHVhqoxKgR168RlERAl0KAJ0Yf2pBemdWub4Zh3gc9Vg3H0bRrgCfb73m
 -7DvKYVz1pMDVAwrfS/3PYDY=
 -=DvU8
 ------END PGP SIGNATURE-----
++P 59be370e52ec814c45efa6cbac45b6df94661b54 822a0283c6bc1c75001f3d1c528a4ff89c6b039c
++R cd73ab3d3f6400b82e1db5686eff6200
 +U dan
- Z d0b6213f5feedc09ae1f6676dae25d67
++Z 0c29ece94fc927539688ff52cbe59deb

diff --cc manifest.uuid
index e8026543241b22e46059f6b0340d87e2ca16af00,3af1e5905f4329c5c8a85b0b267e11b6c3ce9211..6b35f2cebc307fca0bf25b970bb0d4a9069e6341
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 59be370e52ec814c45efa6cbac45b6df94661b54
 -822a0283c6bc1c75001f3d1c528a4ff89c6b039c
++f6d26e07b70965e332b1589804ca938593a5f432

diff --cc src/os_unix.c
Simple merge