Merge trunk changes into experimental branch.

FossilOrigin-Name: aef6698c732f3f9e46986f53e63ca2bdf5f7d208

diff --cc manifest
index 64c799c7db3d9dfd126f065dedb8ce13950392eb,91eccdb9fdda8bf8324dd81b19b7b140898ff22e..dc83753762c21fe2a97d3eb11b1291449453d5a8
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Further\supdates\sto\scomments\sin\spager.c.
- D 2010-08-06T12:00:27
 -C Do\snot\srun\ssome\stests\sin\snotify3.test\swith\sthe\sinmemory_journal\spermutation.\sThey\sdo\snot\spass\sas\sthe\stests\sassume\sthat\sthe\sdatabase\sschema\sis\snot\sloaded\suntil\sthe\sfirst\sinvocation\sof\s[db\seval].\sThis\sis\snot\strue\swith\sthe\sinmemory_journal\spermutation.
 -D 2010-08-06T13:50:07
++C Merge\strunk\schanges\sinto\sexperimental\sbranch.
++D 2010-08-06T13:53:10
  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 202e3dcb3f36c858d4339c0f6fa3d04d67258127
 +F src/os_unix.c ae5ca8a6031380708f3fec7be325233d49944914
 +F src/os_win.c 51cb62f76262d961ea4249489383d714501315a7
- F src/pager.c 3ac13a537a5a1c3fe8cbb39a52e255a52b8b3c99
++F src/pager.c c905bca55b0d507a2c5c9ee97895ba0aaff2a969
  F src/pager.h 80726162dc3942f59ab27b738fb667b9ba0a89d5
  F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
  F src/pcache.c 1e9aa2dbc0845b52e1b51cc39753b6d1e041cb07
@@@ -170,9 -170,9 +170,9 @@@ 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 ae47c9a641c0ce766719aa4657e26b319d253c8c
 +F src/sqlite.h.in 372baf01f7f58b18dfa85e13b55985f2edd6ebc8
  F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
- F src/sqliteInt.h a9be6badc6cd6a3c1ae54475a98661cf351ecad5
+ F src/sqliteInt.h 1086f4a396d6a99c6a8d6654dfb5eb6adf3a476b
  F src/sqliteLimit.h 196e2f83c3b444c4548fc1874f52f84fdbda40f3
  F src/status.c 496913d4e8441195f6f2a75b1c95993a45b9b30b
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -227,10 -227,10 +227,10 @@@ F src/vdbeblob.c 258a6010ba7a82b72b327f
  F src/vdbemem.c e5673f81a2381b35c60e73ef0a8502be2ab1041e
  F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
  F src/vtab.c 82200af3881fa4e1c9cf07cf31d98c09d437e3ab
 -F src/wal.c 0925601f3299c2941a67c9cfff41ee710f70ca82
 -F src/wal.h 906c85760598b18584921fe08008435aa4eeeeb2
 +F src/wal.c 6e04bccccd75acf86725cc8cb4b107cd245e018c
 +F src/wal.h 96669b645e27cd5a111ba59f0cae7743a207bc3c
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
- F src/where.c a4b2cb14dbd727ff277be3f52851425191a87f66
+ F src/where.c 7db3e41c2a846f9deeb24f1bbb75461b4010b7b5
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
  F test/all.test 6745008c144bd2956d58864d21f7b304689c1cce
@@@ -843,7 -841,7 +843,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 4894a5d21044b169f412fef095e689cb8a8575dc
- R c8de9a7d2c35078aa3e4ea331272cd57
 -P a7a15547cccb4aeb719aba19641f31390c316d8c
 -R da6a7e3b792474c6501a800e8485c2ad
++P 5f4c17a33fd442d66c1bf75af9b21954f6906897 698fba826e40ce6414cf6c261441d68b174c1637
++R 608fe42d5e0f4b194d191a9617ba7a7e
  U dan
- Z e0fe6da6eb2070e7d54dde6c557a0593
 -Z 24f7070a35c4e17ac7f061d90b9ace3b
++Z cb0c5df5af28e7e96ef8d49f9e0760f1

diff --cc manifest.uuid
index 0e41de40a0eb7d6866aaca37a1a51398482fc603,d5cb04f362671806c4c47f3bbe60447e9308896d..ec439f5a8633ef9913ed69c04691da98a38b23ee
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5f4c17a33fd442d66c1bf75af9b21954f6906897
 -698fba826e40ce6414cf6c261441d68b174c1637
++aef6698c732f3f9e46986f53e63ca2bdf5f7d208

diff --cc src/pager.c
index a1d6b513ed2d77d8a214456c3a7cb737f402dea1,5f8a90c58a88e6b1b867ddd86412492c1eddb173..6383beb8e5eef1677c9458420269f5902293f957
--- 1/src/pager.c
--- 2/src/pager.c
+++ b/src/pager.c
@@@ -5530,12 -5123,8 +5530,12 @@@ int sqlite3PagerCommitPhaseOne
  ){
    int rc = SQLITE_OK;             /* Return code */
  
 -  /* The dbOrigSize is never set if journal_mode=OFF */
 -  assert( pPager->journalMode!=PAGER_JOURNALMODE_OFF || pPager->dbOrigSize==0 );
 +  assert( pPager->eState==PAGER_WRITER_LOCKED
 +       || pPager->eState==PAGER_WRITER_CACHEMOD
 +       || pPager->eState==PAGER_WRITER_DBMOD
-        || pPager->eState==PAGER_WRITER_ERROR
++       || pPager->eState==PAGER_ERROR
 +  );
 +  assert( assert_pager_state(pPager) );
  
    /* If a prior error occurred, report that error again. */
    if( pPager->errCode ) return pPager->errCode;