Merge the latest trunk changes into uri branch.

FossilOrigin-Name: 7fdd0786c7e0d66baf3aba4485128e16a4e5ea46

diff --cc manifest
index 71007d9576411ae09ed66112f5ffd72567676fc6,51018c9381653c928e3c96a3cc508483b62caae5..5dc26122512af6c92a1424931e4281374aca38ec
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Test\sthat\sit\sis\snow\spossible\sto\suse\sdifferent\sVFSs\sfor\stwo\sdatabases\sattached\sto\sa\ssingle\shandle.
- D 2011-04-23T19:06:26.760
 -C In\swindows,\signore\sERROR_NOT_LOCKED\swhen\scalling\sthe\sread-lock\sremoval\nroutine.
 -D 2011-04-27T19:54:44.305
++C Merge\sthe\slatest\strunk\schanges\sinto\suri\sbranch.
++D 2011-05-02T17:41:01.076
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -133,8 -133,8 +133,8 @@@ F src/delete.c 7a24fcc9a31664d145acb97c
  F src/expr.c e3cf0957c6b8faaaf7386a3bc69e53c0dc9705be
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c a43ba8a005fb5efd1deeee06853e3a6120d46a91
- F src/func.c 3a8cb2fb2de3e3aed7f39106daf4878d9d17fcce
+ F src/func.c b9117e40975245b8504cf3625d7e321d8d4b63dc
 -F src/global.c 02335177cf6946fe5525c6f0755cf181140debf3
 +F src/global.c 29bfb85611dd816b04f10fba0ca910366e128d38
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
@@@ -162,9 -162,9 +162,9 @@@ F src/os.c 22ac61d06e72a0dac90040014733
  F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
  F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
  F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
- F src/os_unix.c d7889a0f9389c8c2e1d3b380f5aa1256c22a90e8
- F src/os_win.c d149b9a7dfdd38de09afc054f8168cd3cd80630b
+ F src/os_unix.c 2c67d126874b78eb427371db4793f0e8fbc7448b
+ F src/os_win.c 4271f0bf733c0b45635ddcfb41c935573de8284c
 -F src/pager.c 055239dcdfe12b3f5d97f6f01f85da01e2d6d912
 +F src/pager.c 24b689bc3639d534f5fb292d2c68038b1e720527
  F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
  F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
  F src/pcache.c 09d38c44ab275db581f7a2f6ff8b9bc7f8c0faaa
@@@ -930,7 -930,7 +931,7 @@@ F tool/speedtest8.c 2902c46588c40b55661
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 68240e75e87a54cde93352b0ec364d34365a8170
- R 4f397b814ac53bbd808b171d5d8b418c
 -P 1bd1484cd7e09709d87aa84b82e87597d00a4162
 -R 9628f97d1cf37de85ec8d2f9df941216
 -U drh
 -Z cb18bd6131d197c3ee5b628d2860f479
++P 2af51f856c6203f836d8bb62b6b79b19554886e7 f55156c5194e85c47728b8a97fde3e5f0a5c9b56
++R 5b3361d8c251d725e8fb18c102b1e7f2
 +U dan
- Z 87fa4f3faa1bbb8cd013b95e032b042b
++Z ce77508d586b51f29df902539114b8b5

diff --cc manifest.uuid
index ac2253e166252023df54e9cb90271b2b03c97900,68e76d018c82725f63d39cc0e3f08136a21de026..8258359950761cc8571ce83d0d161276454267e3
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2af51f856c6203f836d8bb62b6b79b19554886e7
 -f55156c5194e85c47728b8a97fde3e5f0a5c9b56
++7fdd0786c7e0d66baf3aba4485128e16a4e5ea46