Updates to the VFS SHM locking documentation.

FossilOrigin-Name: 9927ce421090ac20285cf05768b38e1f91826a68

diff --git a/doc/vfs-shm.txt b/doc/vfs-shm.txt
index bddc75a8abc4b21a16b8f393b7e84b628e4500ed..93ab457cd3a430976d0048a52dee2a08b7e6bea5 100644 (file)
--- a/doc/vfs-shm.txt
+++ b/doc/vfs-shm.txt
@@ -115,9 +115,6 @@ The following are the allowed lock transitions:
 (11n)  CHECKPOINT         UNLOCK          UNLOCK
 (11o)  RECOVER            READ            READ
 
-These 17 transitions are all that needs to be supported.  The lock
-manager implementation can assert that fact.  The other 25 possible
+These 15 transitions are all that needs to be supported.  The lock
+manager implementation can assert that fact.  The other 27 possible
 transitions among the 7 locking states will never occur.
-
-The rules above are sufficient for correctness.  For maximum concurrency,
-the following additional considerations apply:

diff --git a/manifest b/manifest
index 8fadf4626c6a8f958ef5ad6dbd2d6f65f1fe87c0..b74c4ace4b0220297fb5ec0ca61d31538c8c89a4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Instead\sof\stransitioning\sto\sRECOVER\sstate\sfrom\sCHECKPOINT\swhen\sa\srecovery\sis\srequired,\sperform\sthe\srecovery\swhile\sholding\sthe\sCHECKPOINT\slock.
-D 2010-05-06T18:48:28
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Updates\sto\sthe\sVFS\sSHM\slocking\sdocumentation.
+D 2010-05-06T19:04:49
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -24,7 +27,7 @@ F configure.ac 14740970ddb674d92a9f5da89083dff1179014ff
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
 F doc/pager-invariants.txt 870107036470d7c419e93768676fae2f8749cf9e
-F doc/vfs-shm.txt 2b1a72d895e98fcc2db20573a9c29303223ae8b2
+F doc/vfs-shm.txt 7945d691a41ec90f358f6415095ffe70cfc9fe9e
 F ext/README.txt 913a7bd3f4837ab14d7e063304181787658b14e1
 F ext/async/README.txt 0c541f418b14b415212264cbaaf51c924ec62e5b
 F ext/async/sqlite3async.c 676066c2a111a8b3107aeb59bdbbbf335c348f4a
@@ -813,7 +816,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P dc98ee169cfa43c89f1b36fb1150d4788710fda3
-R ab84b86feedf80f0a73878d980abbcbe
-U dan
-Z 8a72aeec7f63b15de1386fa30a6b1195
+P bb0b6021e721c2e4f1533ab18381604c6b7b31d5
+R d0c72074bd58696b6113038e0e7b28ad
+U drh
+Z c235e53e40bb6d632acab8fb73d916da
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFL4xLUoxKgR168RlERArJdAJ4wNHIzhO7axMFGGElC9w4cUD5XLgCaA4kj
+o/e8Ei4azqkyRgj0IjRHHs8=
+=O2yN
+-----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index b36f0cce0a03c8249061532d24b158167f599769..0b28ffc02292ca70ffd48a2250f2847b69f2eae4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bb0b6021e721c2e4f1533ab18381604c6b7b31d5
\ No newline at end of file
+9927ce421090ac20285cf05768b38e1f91826a68
\ No newline at end of file