diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-08-23 17:20:08 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-08-23 17:20:08 +0000 |
| commit | 914a2f6e987632bc6c5567e87d006459c38a423c (patch) | |
| tree | 80d06a5b8fb5d9c1bd011eb99398b0a06d1a2500 /src/backend/storage/lmgr | |
| parent | 738df2f475c67743e2a8995f3a2cf914396e84ae (diff) | |
Marginal code cleanup for streaming replication.
There is no reason that proc.c should have to get involved in this dirty hack
for letting the postmaster know which children are walsenders. Revert that
file to the way it was, and confine the kluge to pmsignal.c and postmaster.c.
Diffstat (limited to 'src/backend/storage/lmgr')
| -rw-r--r-- | src/backend/storage/lmgr/proc.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 04d11f73cf3..c9993a79dba 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/lmgr/proc.c,v 1.221 2010/07/06 19:18:57 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/storage/lmgr/proc.c,v 1.221.2.1 2010/08/23 17:20:08 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -39,7 +39,6 @@ #include "access/xact.h" #include "miscadmin.h" #include "postmaster/autovacuum.h" -#include "replication/walsender.h" #include "storage/ipc.h" #include "storage/lmgr.h" #include "storage/pmsignal.h" @@ -297,12 +296,7 @@ InitProcess(void) * this; it probably should.) */ if (IsUnderPostmaster && !IsAutoVacuumLauncherProcess()) - { - if (am_walsender) - MarkPostmasterChildWalSender(); - else - MarkPostmasterChildActive(); - } + MarkPostmasterChildActive(); /* * Initialize all fields of MyProc, except for the semaphore which was |