From: dan <dan@noemail.net>
Date: Fri, 30 Apr 2010 16:41:53 +0000 (+0000)
Subject: Fix a problem in the previous commit. Both unixShm.lockState and unixShm.readLock... 
X-Git-Tag: version-3.7.2~455^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43a56b812c6faf2069b428c84fb91c368eda4894;p=thirdparty%2Fsqlite.git

Fix a problem in the previous commit. Both unixShm.lockState and unixShm.readLock should be set to READ when downgrading from a WRITE to a READ lock

FossilOrigin-Name: 90119fecbce06c8db82194dfd9d5045be29b1cda
---

diff --git a/manifest b/manifest
index 00988eee33..b81cad1a8f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\swhereby\supgrading\sfrom\sa\sREAD_FULL\sto\sa\sWRITE\slock,\sand\sthen\sback\sto\sa\sread\slock\swas\sdropping\sall\sWAL\slocks.
-D 2010-04-30T16:38:59
+C Fix\sa\sproblem\sin\sthe\sprevious\scommit.\sBoth\sunixShm.lockState\sand\sunixShm.readLock\sshould\sbe\sset\sto\sREAD\swhen\sdowngrading\sfrom\sa\sWRITE\sto\sa\sREAD\slock
+D 2010-04-30T16:41:54
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in d83a0ffef3dcbfb08b410a6c6dd6c009ec9167fb
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -150,7 +150,7 @@ F src/os.c 8bc63cf91e9802e2b807198e54e50227fa889306
 F src/os.h 534b082c3cb349ad05fa6fa0b06087e022af282c
 F src/os_common.h 0d6ee583b6ee3185eb9d951f890c6dd03021a08d
 F src/os_os2.c 8ad77a418630d7dee91d1bb04f79c2096301d3a0
-F src/os_unix.c d0deee9969cec7364c7de92418888e042a366fcf
+F src/os_unix.c 72413d328c45dce9d7d11a8726a660dd501732c7
 F src/os_win.c a8fc01d8483be472e495793c01064fd87e56a5c1
 F src/pager.c 434f9751fc2dfc11ade004282deda5f8560bcba2
 F src/pager.h 934b598583a9d936bb13c37d62a2fe68ac48781c
@@ -808,7 +808,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 598de52700ba13e3228289220a74fc62073c62d4
-R 723210e8144121fec5928d0b8c025919
+P 55f5af5e174df7a28deeb36faa51138926669897
+R 30163f46a964ded4f6fbb73a10520c97
 U dan
-Z c28d7cd6bf4885aaa152a2bab954cfdb
+Z 2d3273731b921855c7e11145f0f666b0
diff --git a/manifest.uuid b/manifest.uuid
index 56c1228640..771a318cb1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-55f5af5e174df7a28deeb36faa51138926669897
\ No newline at end of file
+90119fecbce06c8db82194dfd9d5045be29b1cda
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index 6e01ffb6bf..a85d7a61bf 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -5242,7 +5242,7 @@ static int unixShmLock(
       }else if( p->lockState==SQLITE_SHM_WRITE ){
         rc = unixShmSharedLock(pFile, p, UNIX_SHM_A);
         unixShmUnlock(pFile, p, UNIX_SHM_C|UNIX_SHM_D);
-        p->lockState = SQLITE_SHM_READ;
+        p->lockState = p->readLock = SQLITE_SHM_READ;
       }else{
         assert( p->lockState==SQLITE_SHM_RECOVER );
         unixShmUnlock(pFile, p, UNIX_SHM_MUTEX);