Merge further trunk changes into experimental branch.

FossilOrigin-Name: fb847d70407b0f0e548919b7554f62bc1dab8a6c

diff --cc manifest
index 7e17c9af8d36f6c1094daaaf69afa258aa30ac6f,0279e04f113d808a0b5b0179423eec2ca4f4c87f..8c0289ea3a5ab5dd8a949f31c1c65df77c2bfbd4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\strunk\schanges\sinto\sexperimental\sbranch.
- D 2010-07-28T18:35:50
 -C Add\stests\sto\scheck\sthat\sthe\sICU\sregexp()\sfunction\scan\sonly\sbe\scalled\swith\sexactly\stwo\sarguments.
 -D 2010-07-30T05:06:05
++C Merge\sfurther\strunk\schanges\sinto\sexperimental\sbranch.
++D 2010-07-30T07:26:51
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -154,9 -154,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 33117640d8e0058dbf705b95e20ebf246cbb4bc1
 +F src/os_unix.c ae5ca8a6031380708f3fec7be325233d49944914
 +F src/os_win.c 51cb62f76262d961ea4249489383d714501315a7
- F src/pager.c 4cf634d80958f69fa3882624067423cd7547d976
++F src/pager.c 65efcf8cc70de5facf4375dbd78a99ceb3d19d6e
  F src/pager.h 879fdde5a102d2f21a3135d6f647530b21c2796c
  F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
  F src/pcache.c 1e9aa2dbc0845b52e1b51cc39753b6d1e041cb07
@@@ -170,7 -170,7 +170,7 @@@ F src/resolve.c 1c0f32b64f8e3f555fe1f73
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c 74fef1334bec27e606ef0b19e5c41cd0a639e69c
  F src/shell.c 8517fc1f9c59ae4007e6cc8b9af91ab231ea2056
- F src/sqlite.h.in 77af8becd95ddd5149448fa667b20845da98072d
 -F src/sqlite.h.in ae47c9a641c0ce766719aa4657e26b319d253c8c
++F src/sqlite.h.in 372baf01f7f58b18dfa85e13b55985f2edd6ebc8
  F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
  F src/sqliteInt.h a9be6badc6cd6a3c1ae54475a98661cf351ecad5
  F src/sqliteLimit.h 196e2f83c3b444c4548fc1874f52f84fdbda40f3
@@@ -840,7 -839,7 +840,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 0714aeccd82d82686c074c1bb74ea794b7bfa3a3 ae89777e7f8bae2cdd3407395ea84c1b39577c4b
- R 929440acfba750114000a8118fc5b2ef
 -P d37443d33388b402e610a00c362a1e2e79548801
 -R 1df44901de4b741a545cdb85506640b4
++P aa81900153a2762cb2ad41e6710c1f1e7dc8b41e 451d965742cc219db709939b4ba1da2f2343dbce
++R ed3ad896c2cd90b3c1af9b65becc7431
  U dan
- Z 1bb342ebf679301c7cb8840574e16573
 -Z 47b66d0e2bb0d61fe912692f971ceef4
++Z 9e7bcf251287b29d791a1cd12b29e0e0

diff --cc manifest.uuid
index 1b72985d5b55dfdb603f67b578eeb79c02634695,98e63518650b59628d0ec7dbfeeab0127d6a9a90..57955c6cf084454f56d48c49dffb5f59bdc72ac8
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- aa81900153a2762cb2ad41e6710c1f1e7dc8b41e
 -451d965742cc219db709939b4ba1da2f2343dbce
++fb847d70407b0f0e548919b7554f62bc1dab8a6c

diff --cc src/pager.c
index 3f82d7fd8025658dedfca53782d84085da63fe64,d5bbae145c6ab7b2f9cc7795fcbd62df3c432c93..de3547a897b29970c67bb1f5841c063cc26634a4
--- 1/src/pager.c
--- 2/src/pager.c
+++ b/src/pager.c
@@@ -332,7 -332,7 +332,7 @@@ struct PagerSavepoint 
  struct Pager {
    sqlite3_vfs *pVfs;          /* OS functions to use for IO */
    u8 exclusiveMode;           /* Boolean. True if locking_mode==EXCLUSIVE */
--  u8 journalMode;             /* On of the PAGER_JOURNALMODE_* values */
++  u8 journalMode;             /* One of the PAGER_JOURNALMODE_* values */
    u8 useJournal;              /* Use a rollback journal on this file */
    u8 noReadlock;              /* Do not bother to obtain readlocks */
    u8 noSync;                  /* Do not sync the journal if true */
@@@ -5152,7 -5152,7 +5152,7 @@@ int sqlite3PagerCommitPhaseOne
        );
        if( !zMaster && isOpen(pPager->jfd) 
         && pPager->journalOff==jrnlBufferSize(pPager) 
--       && pPager->dbSize>=pPager->dbFileSize
++       && pPager->dbSize>=pPager->dbOrigSize
         && (0==(pPg = sqlite3PcacheDirtyList(pPager->pPCache)) || 0==pPg->pDirty)
        ){
          /* Update the db file change counter via the direct-write method. The 

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