From: dan <dan@noemail.net>
Date: Tue, 27 Apr 2010 18:49:54 +0000 (+0000)
Subject: Merge two "wal" leaves.
X-Git-Tag: version-3.7.2~455^2~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b64c1e365618707feed1b2d92b80e778183abbe;p=thirdparty%2Fsqlite.git

Merge two "wal" leaves.

FossilOrigin-Name: 8c2d43babd61fe2225d5c402174253f412604092
---

4b64c1e365618707feed1b2d92b80e778183abbe
diff --cc manifest
index 3b7f145e8b,68088c71ab..b87e29226b
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,5 @@@
- C Add\sa\stest\sto\scheck\sthat\sa\scheckpointer\sreleases\sits\slocks\sbefore\sreturning,\seven\sif\sit\shas\sbeen\sprevented\sby\sa\sconflicting\slock\sfrom\scheckpointing\sthe\sdatabase.\nAdd\sa\stest\sto\scheck\sthat\sa\scheckpointer\sreleases\sits\slocks\sbefore\sreturning,\seven\sif\sit\shas\sbeen\sprevented\sby\sa\sconflicting\slock\sfrom\scheckpointing\sthe\sdatabase.
- D 2010-04-27T18:43:17
 ------BEGIN PGP SIGNED MESSAGE-----
 -Hash: SHA1
 -
 -C Add\sthe\sxShmRelease()\smethod\sto\sthe\sVFS.\s\sThe\sos_unix.c\simplementation\sof\nthe\sshared\smemory\slogic\sis\sstill\snon-functional.
 -D 2010-04-27T11:49:27
++C Merge\stwo\s"wal"\sleaves.
++D 2010-04-27T18:49:54
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in d83a0ffef3dcbfb08b410a6c6dd6c009ec9167fb
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -221,7 -224,7 +221,7 @@@ F src/vdbeblob.c 5327132a42a91e8b7acfb6
  F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1
  F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
  F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda
--F src/wal.c 26d2a7028cc4af995e657431e2dbcea0aac63784
++F src/wal.c 1576b36d55220d42598a5fb48a06e083efecea75
  F src/wal.h 812101dd76610401fbcd44114e7e8b7ce0224645
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
  F src/where.c faadd9c2bf08868e5135192b44e0d753e363a885
@@@ -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 c8658da44671e9c43c90ee4857bbe82c55d40f25
- R a5a18287a7b1df82858844e5aea7a99d
 -P c8893310510148f7e71ede5691606b6fc1c3df4d
 -R fb13be4dd0d753be93180ef3cbf1d215
 -U drh
 -Z 6f72fe2227e763bb3a1c4d06bd5a901c
 ------BEGIN PGP SIGNATURE-----
 -Version: GnuPG v1.4.6 (GNU/Linux)
 -
 -iD8DBQFL1s9KoxKgR168RlERAqqPAJ0SGEtAEImz4CyMiguEDpkB2AslLQCfd9o1
 -tWw2lhvU6jis7pTQTOVY1gE=
 -=4LgW
 ------END PGP SIGNATURE-----
++P be44349d2b790fb470fcc9fb6a12e8b1076dc645 ed715b47c5f7657fbf901805981867898054b14d
++R 543123f4859d04253152521c95f2472b
 +U dan
- Z 295004ae7ba64e99842190f4e410241f
++Z 67c1d58e24d1fcb9816b2a39774cf9f7
diff --cc manifest.uuid
index baa627f5aa,2c39d62be3..e7f2fb29f8
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- be44349d2b790fb470fcc9fb6a12e8b1076dc645
 -ed715b47c5f7657fbf901805981867898054b14d
++8c2d43babd61fe2225d5c402174253f412604092
diff --cc src/wal.c
index 14ee78d9f1,14ee78d9f1..4710c89a50
--- a/src/wal.c
+++ b/src/wal.c
@@@ -4,6 -4,6 +4,7 @@@
  ** "journal_mode=wal" mode.
  */
  
++
  /*
  ** LOG FILE FORMAT
  **
@@@ -157,7 -157,7 +158,7 @@@ struct LogSummary 
  **         obtains the DMH lock (see below), and while log recovery is
  **         being run.
  **
--** DMH:    The DMH (Dead Mans Hand mechanism) lock is used to ensure
++** DMS:    The DMS (Dead Mans Switch mechanism) lock is used to ensure
  **         that log-recovery is always run following a system restart.
  **         When it first opens a log-summary file, a process takes a
  **         SHARED lock on the DMH region. This lock is not released until