Merge two leaves on the WAL branch.

FossilOrigin-Name: c9ed66cc3994b3b0d67a6c950b552a1a869f2ed2

diff --cc manifest
index 4dcbaf750eacc8bec39cb61b7c7e1dc12842f0a6,1f60425958c9bb3122e2873bb28b7712073df9e8..2132014ce6eb023c7bf0f0e5553a5ae34c52214c
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,5 @@@
- C Change\sthe\sway\schecksums\sare\scalculated.
- D 2010-04-15T10:58:52
 ------BEGIN PGP SIGNED MESSAGE-----
 -Hash: SHA1
 -
 -C Fix\sa\sproblem\sin\sthe\sresult\sset\ssize\sestimation\slogic\sof\sthe\squery\splanner\s-\s\na\sproblem\sintroduced\sby\sthe\stwo\sprevious\schanges.
 -D 2010-04-15T12:36:07
++C Merge\stwo\sleaves\son\sthe\sWAL\sbranch.
++D 2010-04-15T13:33:18
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -131,7 -134,7 +131,7 @@@ F src/journal.c b0ea6b70b532961118ab703
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
  F src/loadext.c 1c7a61ce1281041f437333f366a96aa0d29bb581
- F src/log.c bf7ce56249b2a08d26b4029430c32a01efc4a64e
 -F src/log.c 165addfd51fa9581936ec04914b17a3b274c49bd
++F src/log.c 3647edbc85ac745db7f18bc1102344aa2ee5259a
  F src/log.h a2654af46ce7b5732f4d5a731abfdd180f0a06d9
  F src/main.c c0e7192bad5b90544508b241eb2487ac661de890
  F src/malloc.c a08f16d134f0bfab6b20c3cd142ebf3e58235a6a
@@@ -804,7 -807,14 +804,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
--P 82969f27e5ea843cb379666d8a02e4a3fddc03b2
- R b356f412a9c351edeb3f07a632ecce9f
 -R 351077133ab404e2e491a33b905acb9d
 -U drh
 -Z 2a5a2f50be97ee24579935014cd533e4
 ------BEGIN PGP SIGNATURE-----
 -Version: GnuPG v1.4.6 (GNU/Linux)
 -
 -iD8DBQFLxwg6oxKgR168RlERAn1aAJ96LitidK5axyWqFd8S2OYRbsKviACdE9xg
 -/OWvfn581zFJtn2LS8VJjjA=
 -=qS5Y
 ------END PGP SIGNATURE-----
++P 84955c2e9ce526c5a3ed479aa09f093a7e37c7d0 33b1f584ef712625c4df8e2aefe895fa89f6a795
++R bcaf3c70b81f92c4b906909c026342d3
 +U dan
- Z 01a21dba5524ff578c531f4245d5f626
++Z 3782bee1cb14af26018fee50d035e5d0

diff --cc manifest.uuid
index c8288d828e080165459767486409bed6b13b8a64,a4611cbd357b440fcd4f2fe750ab849dd4c5c1a9..a18185b651db92cdafd9e3e0fd2720633d629c28
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 84955c2e9ce526c5a3ed479aa09f093a7e37c7d0
 -33b1f584ef712625c4df8e2aefe895fa89f6a795
++c9ed66cc3994b3b0d67a6c950b552a1a869f2ed2

diff --cc src/log.c
index 112b907f4c6ff593f2ac09d71ba518a3085e0f50,30d9d8ded6600d21701e4126cc87c61ca4839a3d..032b210a28f300c39f6ee75fb409e7c6bcf5b572
--- 1/src/log.c
--- 2/src/log.c
+++ b/src/log.c
@@@ -806,6 -808,6 +806,10 @@@ static int logCheckpoint
    u32 iDbpage = 0;                /* Next database page to write */
    u32 iFrame = 0;                 /* Log frame containing data for iDbpage */
  
++  if( pLog->hdr.iLastPg==0 ){
++    return SQLITE_OK;
++  }
++
    /* Allocate the iterator */
    pIter = logCheckpointInit(pLog);
    if( !pIter ) return SQLITE_NOMEM;