diff options
| author | Magnus Hagander <magnus@hagander.net> | 2008-10-30 17:04:11 +0000 |
|---|---|---|
| committer | Magnus Hagander <magnus@hagander.net> | 2008-10-30 17:04:11 +0000 |
| commit | 3a0b0e8260965f10227599d7961dbccbbb53a903 (patch) | |
| tree | b841ba142fa334dca0e7e51502dae443ff819f3d /src | |
| parent | f6dc2786ab5f803639d2565cec4e009f1d997816 (diff) | |
| download | postgresql-3a0b0e8260965f10227599d7961dbccbbb53a903.tar.gz postgresql-3a0b0e8260965f10227599d7961dbccbbb53a903.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/port/win32_shmem.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/backend/port/win32_shmem.c b/src/backend/port/win32_shmem.c index d3532f222ae..394eb976f04 100644 --- a/src/backend/port/win32_shmem.c +++ b/src/backend/port/win32_shmem.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32_shmem.c,v 1.4.2.1 2008/07/04 10:50:20 mha Exp $ + * $PostgreSQL: pgsql/src/backend/port/win32_shmem.c,v 1.4.2.2 2008/10/30 17:04:11 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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 = '/'; |