Merge trunk changes into experimental branch.

FossilOrigin-Name: aa81900153a2762cb2ad41e6710c1f1e7dc8b41e

diff --cc manifest
index 56239ec085969906895ed9903e80acd55128255d,32c52393d665a4a48cfaf43aed3029a95806f6d2..7e17c9af8d36f6c1094daaaf69afa258aa30ac6f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,5 @@@
- C Fix\serrors\sin\swal3.test\scaused\sby\srecent\smodifications.
- D 2010-07-28T15:10:38
 ------BEGIN PGP SIGNED MESSAGE-----
 -Hash: SHA1
 -
 -C Improve\sthe\saccuracy\sof\sthe\sPager\sheap\susage\sestimate.
 -D 2010-07-28T17:36:12
++C Merge\strunk\schanges\sinto\sexperimental\sbranch.
++D 2010-07-28T18:35:50
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -154,9 -157,9 +154,9 @@@ F src/os.c 60178f518c4d6c0dcb59f7292232
  F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
  F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
  F src/os_os2.c 72d0b2e562952a2464308c4ce5f7913ac10bef3e
 -F src/os_unix.c 3109e0e5a0d5551bab2e8c7322b20a3b8b171248
 -F src/os_win.c 1f8b0a1a5bcf6289e7754d0d3c16cec16d4c93ab
 -F src/pager.c b877df9489b647cb3a9b3590f168bd4ee31bf9e7
 +F src/os_unix.c ae5ca8a6031380708f3fec7be325233d49944914
 +F src/os_win.c 51cb62f76262d961ea4249489383d714501315a7
- F src/pager.c 27ace2e07c8bfe2e04428eba03b2ddb5b03abd7d
++F src/pager.c 4cf634d80958f69fa3882624067423cd7547d976
  F src/pager.h 879fdde5a102d2f21a3135d6f647530b21c2796c
  F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
  F src/pcache.c 1e9aa2dbc0845b52e1b51cc39753b6d1e041cb07
@@@ -169,8 -172,8 +169,8 @@@ F src/random.c cd4a67b3953b88019f8cd4cc
  F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c 74fef1334bec27e606ef0b19e5c41cd0a639e69c
- F src/shell.c fd4ccdb37c3b68de0623eb938a649e0990710714
- F src/sqlite.h.in 10bd4aed244fc0eadb10ec01cedb60bafc2d7bfe
+ F src/shell.c 8517fc1f9c59ae4007e6cc8b9af91ab231ea2056
 -F src/sqlite.h.in 373dedd8489ecd9dfb33d6d4378ee9f34a3c2386
++F src/sqlite.h.in 77af8becd95ddd5149448fa667b20845da98072d
  F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
  F src/sqliteInt.h a9be6badc6cd6a3c1ae54475a98661cf351ecad5
  F src/sqliteLimit.h 196e2f83c3b444c4548fc1874f52f84fdbda40f3
@@@ -839,7 -842,14 +840,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P a038688c991435967b935946c2283707820bb5da
- R 27913a854c524e2ed86aec3ca2a1108c
 -P 2f2fa7dd809ae2a67048643da8c01a4664848ba7
 -R b7bd2ca1374c0179d87c6bae7ca407e6
 -U drh
 -Z 03585c4f4d1ec104a0103a0a8c108d7f
 ------BEGIN PGP SIGNATURE-----
 -Version: GnuPG v1.4.6 (GNU/Linux)
 -
 -iD8DBQFMUGqPoxKgR168RlERAgxrAJ4+w32hgMSWWsLb7m9/xZmvHyOoagCaAmtG
 -MhNGa6qhE2RISj/kSRw4Vo0=
 -=wqBl
 ------END PGP SIGNATURE-----
++P 0714aeccd82d82686c074c1bb74ea794b7bfa3a3 ae89777e7f8bae2cdd3407395ea84c1b39577c4b
++R 929440acfba750114000a8118fc5b2ef
 +U dan
- Z bf8c1f74204eb606b6c5a25382962d26
++Z 1bb342ebf679301c7cb8840574e16573

diff --cc manifest.uuid
index b65a0b66125c1428c1280cd0c08a4fb81e61c97c,fba61ba2afead4e732b1b996681d25184aae6de1..1b72985d5b55dfdb603f67b578eeb79c02634695
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0714aeccd82d82686c074c1bb74ea794b7bfa3a3
 -ae89777e7f8bae2cdd3407395ea84c1b39577c4b
++aa81900153a2762cb2ad41e6710c1f1e7dc8b41e

diff --cc src/pager.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge