Merge two wal leaves.

FossilOrigin-Name: 23c0e6c3f333e878fe5a2ae5d61df0d765f437b4

diff --cc manifest
index ee782bfe90c104aefc0457320e37b6b3ff68ddd9,cd86dfff2495e156b8f8cdbd0992770d393f0809..e67d5cc39f2f3e17b282ff6c5887fb64928aff85
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,5 @@@
- C Add\sthe\ssqlite3_wal_checkpoint()\sand\ssqlite3_wal_autocheckpoint()\sAPIs.
- D 2010-05-03T08:04:49
 ------BEGIN PGP SIGNED MESSAGE-----
 -Hash: SHA1
 -
 -C Change\sthe\sSHM\sinterface\sso\sthat\sit\sdoes\snot\stake\sthe\sname\sof\sthe\sshared\nobject\sbut\srather\sthe\sname\sof\sthe\sWAL\sfile\sand\sderives\sits\sown\sname\sfrom\nthat.\s\sRemove\sthe\sxShmDelete\smethod\sfrom\sthe\sVFS\sand\sreplace\sit\swith\sa\ndelete\sflag\son\sxShmClose.
 -D 2010-05-01T20:17:31
++C Merge\stwo\swal\sleaves.
++D 2010-05-03T08:19:34
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in d83a0ffef3dcbfb08b410a6c6dd6c009ec9167fb
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -166,9 -169,9 +166,9 @@@ F src/resolve.c ac5f1a713cd1ae77f08b83c
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c c03d8a0565febcde8c6a12c5d77d065fddae889b
  F src/shell.c c40427c7245535a04a9cb4a417b6cc05c022e6a4
- F src/sqlite.h.in dcf9cfc4e9c75d00b822d1a0d07f28cb970932bf
 -F src/sqlite.h.in 50df638fd31ae342d280582af8fc9d232b588dfe
++F src/sqlite.h.in 8097161ad63e2a00e26217da43327d396371c2e5
  F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
 -F src/sqliteInt.h 3eb613c8ba7f5159be0acf3fc148d41ec49add86
 +F src/sqliteInt.h 1f81585797162269a0f18b77c815d552dad636c2
  F src/sqliteLimit.h 3afab2291762b5d09ae20c18feb8e9fa935a60a6
  F src/status.c 4df6fe7dce2d256130b905847c6c60055882bdbe
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -188,7 -191,7 +188,7 @@@ F src/test_backup.c c129c91127e9b46e335
  F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2
  F src/test_config.c 6210f501d358bde619ae761f06f123529c6ba24f
  F src/test_demovfs.c da81a5f7785bb352bda7911c332a983ec4f17f27
- F src/test_devsym.c c05024cd179603181cde66d0ff83ce81e146f6de
 -F src/test_devsym.c 84b80966ee2aa72fdd0b42eaa90406478f390b03
++F src/test_devsym.c 3d324248b80f31b3b29ab9bca39c4d856a2c9160
  F src/test_func.c 13b582345fb1185a93e46c53310fae8547dcce20
  F src/test_hexio.c 1237f000ec7a491009b1233f5c626ea71bce1ea2
  F src/test_init.c 5d624ffd0409d424cf9adbfe1f056b200270077c
@@@ -808,7 -811,14 +808,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 6af2dca75b8139134ea394c1d71aefc6523f02e9
- R c94ad925a665396e6feea1ca0a681bf5
 -P 69e07fdbde5054593de948b76dfac157cf5d4058
 -R c9705329895ad0e28623e29f2274d0f1
 -U drh
 -Z 6445a2aee9bd8de55a45628ec7b23c47
 ------BEGIN PGP SIGNATURE-----
 -Version: GnuPG v1.4.6 (GNU/Linux)
 -
 -iD8DBQFL3IxeoxKgR168RlERAtmWAJ9fbAccfEA031KC3xWSzcIzuGnUqQCfVHJO
 -hXR2b742paRdI5uwLVma/eQ=
 -=uRJQ
 ------END PGP SIGNATURE-----
++P 9803196dec85e3aa4105cc477e9cfe98d370e486 94dea5f9c11a68564220cec76ac3fae2ba90e907
++R 788341a84b9fc72cb664689f96e77759
 +U dan
- Z 86d18456fd55c8daa32a6607f2d982a8
++Z 74b01ac5f69a8df35f22fcc654a97307

diff --cc manifest.uuid
index c8b15e00439ce77899e3d7b368aff8c9ade3053c,d26027c4404be04ac70d492e4362db7488a68d4f..f4ae2cc983157f120efa752130224e28e79a1438
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9803196dec85e3aa4105cc477e9cfe98d370e486
 -94dea5f9c11a68564220cec76ac3fae2ba90e907
++23c0e6c3f333e878fe5a2ae5d61df0d765f437b4

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

diff --cc src/test_devsym.c
index dff7b98803193f5d4043938f49dcfa7353b93fd9,6420731077b82409b8613ae6422a41ff0ebfa84b..69d716246d292e1db9f896792bb8d214e1a7f95d
--- 1/src/test_devsym.c
--- 2/src/test_devsym.c
+++ b/src/test_devsym.c
@@@ -106,11 -105,10 +105,8 @@@ static sqlite3_vfs devsym_vfs = 
    devsymShmSize,
    devsymShmGet,
    devsymShmRelease,
--  0,
--  0,
    devsymShmLock,
    devsymShmClose,
-   devsymShmDelete,
    0,
    0,
  };