ISTM that IsUnderPostmaster should mean we are a child process of the
postmaster ... it should not be set in the postmaster itself.
This commit is contained in:
parent
85c2d1c4ca
commit
e43d51fddc
@ -37,7 +37,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.243 2001/09/21 20:31:48 tgl Exp $
|
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.244 2001/09/30 20:08:18 tgl Exp $
|
||||||
*
|
*
|
||||||
* NOTES
|
* NOTES
|
||||||
*
|
*
|
||||||
@ -312,8 +312,6 @@ PostmasterMain(int argc, char *argv[])
|
|||||||
char original_extraoptions[MAXPGPATH];
|
char original_extraoptions[MAXPGPATH];
|
||||||
char *potential_DataDir = NULL;
|
char *potential_DataDir = NULL;
|
||||||
|
|
||||||
IsUnderPostmaster = true; /* so that backends know this */
|
|
||||||
|
|
||||||
*original_extraoptions = '\0';
|
*original_extraoptions = '\0';
|
||||||
|
|
||||||
progname = argv[0];
|
progname = argv[0];
|
||||||
@ -1935,6 +1933,8 @@ DoBackend(Port *port)
|
|||||||
* Let's clean up ourselves as the postmaster child
|
* Let's clean up ourselves as the postmaster child
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
IsUnderPostmaster = true; /* we are a postmaster subprocess now */
|
||||||
|
|
||||||
/* We don't want the postmaster's proc_exit() handlers */
|
/* We don't want the postmaster's proc_exit() handlers */
|
||||||
on_exit_reset();
|
on_exit_reset();
|
||||||
|
|
||||||
@ -2317,6 +2317,8 @@ SSDataBase(int xlop)
|
|||||||
beos_backend_startup();
|
beos_backend_startup();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
IsUnderPostmaster = true; /* we are a postmaster subprocess now */
|
||||||
|
|
||||||
/* Lose the postmaster's on-exit routines and port connections */
|
/* Lose the postmaster's on-exit routines and port connections */
|
||||||
on_exit_reset();
|
on_exit_reset();
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user