Horton

shmem-remove-asserts.patch

text/x-diff

Download
Filename: shmem-remove-asserts.patch
Type: text/x-diff
Part: 0
Message: Re: BUG #15804: Assertion failure when using logging_collector with EXEC_BACKEND

Patch

Format: unified
File+−
src/backend/port/sysv_shmem.c 0 1
src/backend/port/win32_shmem.c 0 4 
diff --git a/src/backend/port/sysv_shmem.c b/src/backend/port/sysv_shmem.c
index fda3442c5b..5a1e782f69 100644
--- a/src/backend/port/sysv_shmem.c
+++ b/src/backend/port/sysv_shmem.c
@@ -845,7 +845,6 @@ PGSharedMemoryReAttach(void)
 void
 PGSharedMemoryNoReAttach(void)
 {
-	Assert(UsedShmemSegAddr != NULL);
 	Assert(IsUnderPostmaster);
 
 #ifdef __CYGWIN__
diff --git a/src/backend/port/win32_shmem.c b/src/backend/port/win32_shmem.c
index ccd7b6b5e3..5ae0643c20 100644
--- a/src/backend/port/win32_shmem.c
+++ b/src/backend/port/win32_shmem.c
@@ -551,10 +551,6 @@ pgwin32_ReserveSharedMemoryRegion(HANDLE hChild)
 {
 	void	   *address;
 
-	Assert(ShmemProtectiveRegion != NULL);
-	Assert(UsedShmemSegAddr != NULL);
-	Assert(UsedShmemSegSize != 0);
-
 	/* ShmemProtectiveRegion */
 	address = VirtualAllocEx(hChild, ShmemProtectiveRegion,
 							 PROTECTIVE_REGION_SIZE,