summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Hagander2008-10-30 17:04:11 +0000
committerMagnus Hagander2008-10-30 17:04:11 +0000
commit696df5a57d29781d4433f8cc5ef1bfb7b9a07154 (patch)
treed91edac77394550dbd69a96d037b851fbdf5dba6
parent17cdb4ca40595498c03c681356d6112ec0d8bc71 (diff)
Revert previous patch to put the shared memory segment on win32
in the Global\ namespace, because it caused permission errors on a lot of platforms. We need to come up with something better for 8.4, but for now revert to the pre-8.3.4 behaviour.
-rw-r--r--src/backend/port/win32_shmem.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/backend/port/win32_shmem.c b/src/backend/port/win32_shmem.c
index 970b552043..893ca609ef 100644
--- a/src/backend/port/win32_shmem.c
+++ b/src/backend/port/win32_shmem.c
@@ -57,7 +57,13 @@ GetSharedMemName(void)
elog(FATAL, "could not generate full pathname for datadir %s: %lu",
DataDir, GetLastError());
- for (cp = retptr + 18; *cp; cp++)
+ /*
+ * XXX: Intentionally overwriting the Global\ part here. This was not the
+ * original approach, but putting it in the actual Global\ namespace
+ * causes permission errors in a lot of cases, so we leave it in
+ * the default namespace for now.
+ */
+ for (cp = retptr; *cp; cp++)
if (*cp == '\\')
*cp = '/';