From ededaa59bdc409b7ca5895cae3b8314efb084ebb Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 1 Oct 2004 03:02:48 +0000 Subject: [PATCH] Fully release exclusive locks in the Unlock primitive of Unix. Ticket #913. (CVS 1993) FossilOrigin-Name: 11a37a74b101b9e37dcf1c3e57e45fbcd39a1c21 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/os_unix.c | 5 +++++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index 9e008b34fd..7717a2a5b6 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Use\stype\si64\sinstead\sof\soff_t\sfor\sfile\soffsets\ssince\soff_t\sis\sgiving\nportability\sproblems.\s\sTicket\s#924.\s(CVS\s1992) -D 2004-10-01T02:00:31 +C Fully\srelease\sexclusive\slocks\sin\sthe\sUnlock\sprimitive\sof\sUnix.\nTicket\s#913.\s(CVS\s1993) +D 2004-10-01T03:02:48 F Makefile.in abdeb5bd9d017822691884935c320037c33f6ee6 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd @@ -47,7 +47,7 @@ F src/os_mac.c 7367dab0c44ab0b2c4337e73ac6f6f97f171c2cb F src/os_mac.h 608fdf39eafa1ce25fc8cb223b8b0a073341d4da F src/os_test.c d9a21852d170f20adeae6f224d1beba2cb5af8aa F src/os_test.h 6a26a4978492e4bbdbf385554958418ff02db162 -F src/os_unix.c 6a02c1bc1d6d73332daaea695116030aebd60c2a +F src/os_unix.c 8ee13cc8efb47dd3269327f1659f0aa59449e7e0 F src/os_unix.h f3097815e041e82e24d92505e1ff61ba24172d13 F src/os_win.c 0ab81ce1e4739e0e251b6aa3e74e1a6b75b612da F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b @@ -247,7 +247,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4 -P 1d3c6f735101d8fc582871c0370805596d975001 -R 4ac86aa49220b9d9c39284b9bff439d6 +P 8972c004dc825f668d952e7d082a89046b9260f1 +R c18f14c1b88558caba10e1e626c64832 U drh -Z 3cafaabb57dd86a72ca0b894aa70f6d5 +Z cf49e4565c24c55963de6fd9ac42f0ce diff --git a/manifest.uuid b/manifest.uuid index 75e5efc622..7f9f788547 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -8972c004dc825f668d952e7d082a89046b9260f1 \ No newline at end of file +11a37a74b101b9e37dcf1c3e57e45fbcd39a1c21 \ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index aab518f47c..c0261e1c79 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -1039,6 +1039,11 @@ int sqlite3OsUnlock(OsFile *id, int locktype){ assert( pLock->cnt!=0 ); if( id->locktype>SHARED_LOCK ){ assert( pLock->locktype==id->locktype ); + lock.l_type = F_RDLCK; + lock.l_whence = SEEK_SET; + lock.l_start = SHARED_FIRST; + lock.l_len = SHARED_SIZE; + fcntl(id->h, F_SETLK, &lock); lock.l_type = F_UNLCK; lock.l_whence = SEEK_SET; lock.l_start = PENDING_BYTE; -- 2.47.3