From: dan <Dan Kennedy>
Date: Wed, 10 Feb 2021 19:49:35 +0000 (+0000)
Subject: Remove an assert() added by the previous commit that is sometimes false.
X-Git-Tag: version-3.35.0~102^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fshm-lock-fix;p=thirdparty%2Fsqlite.git

Remove an assert() added by the previous commit that is sometimes false.

FossilOrigin-Name: fb36ac4dc60ccc6c5fba3f23e13fcab985f27ebef0527c929806cda5f9d3660c
---

diff --git a/manifest b/manifest
index 5bede417d1..c7125d8713 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\slongstanding\sproblem\scausing\san\sRBU\svacuum\sto\somit\sreleasing\ssome\slocks\sbefore\sfinishing.
-D 2021-02-10T19:40:47.797
+C Remove\san\sassert()\sadded\sby\sthe\sprevious\scommit\sthat\sis\ssometimes\sfalse.
+D 2021-02-10T19:49:35.745
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -525,7 +525,7 @@ F src/os.c 2d6e646370b1aa78942c68d7edf124e518963adf4a90bce87f365a5a5495529a
 F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
-F src/os_unix.c 0e712a25b35921fa8b8bbda141c70ba2bde3871dd43d0efe79107327c9058589
+F src/os_unix.c adbbcea4c63d3b400d405f60a5da4c01433753ec4a12e2dc695beb2bbd671fe9
 F src/os_win.c 77d39873836f1831a9b0b91894fec45ab0e9ca8e067dc8c549e1d1eca1566fe9
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c c49952ac5e9cc536778eff528091d79d38b3e45cbeeed4695dc05e207dc6547d
@@ -1899,7 +1899,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P bd1e9e0a4c0e07901ef59fe3b7e6f7b9cc66ccfcd5192f576e1620820891de99
-R 2559369e2b744524005199c4dee97027
+P cb5bdf82fe0f90922dc34202be9d0aa34d899afff4200456623765da2877ca41
+R f4fc3fdf82de1da25700d7b06c4d78f5
 U dan
-Z 5291d693cac6649082a01a89198a422f
+Z a1b0598c229f8a1f298b7df3e89aeb78
diff --git a/manifest.uuid b/manifest.uuid
index 1b88ab91e2..8aeb0855ce 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cb5bdf82fe0f90922dc34202be9d0aa34d899afff4200456623765da2877ca41
\ No newline at end of file
+fb36ac4dc60ccc6c5fba3f23e13fcab985f27ebef0527c929806cda5f9d3660c
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index 7156b2aeac..a688ed2706 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -5022,7 +5022,6 @@ static int unixShmUnmap(
   if( p==0 ) return SQLITE_OK;
   pShmNode = p->pShmNode;
 
-  assert( p->exclMask==0 && p->sharedMask==0 );
   assert( pShmNode==pDbFd->pInode->pShmNode );
   assert( pShmNode->pInode==pDbFd->pInode );