Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit721996d

Browse files
committed
Cleanup patch for exec() handling.
1 parenta7fd03e commit721996d

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

‎src/backend/bootstrap/bootstrap.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.151 2003/05/0303:52:07 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.152 2003/05/0305:13:18 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -236,7 +236,7 @@ BootstrapMain(int argc, char *argv[])
236236
*
237237
* If we are running under the postmaster, this is done already.
238238
*/
239-
if (!IsUnderPostmaster)
239+
if (!IsUnderPostmaster||ExecBackend)
240240
MemoryContextInit();
241241

242242
/*
@@ -245,9 +245,12 @@ BootstrapMain(int argc, char *argv[])
245245

246246
/* Set defaults, to be overriden by explicit options below */
247247
dbName=NULL;
248-
if (!IsUnderPostmaster)
248+
if (!IsUnderPostmaster||ExecBackend)
249249
{
250250
InitializeGUCOptions();
251+
#ifdefEXEC_BACKEND
252+
read_nondefault_variables();
253+
#endif
251254
potential_DataDir=getenv("PGDATA");/* Null if no PGDATA
252255
* variable */
253256
}
@@ -306,7 +309,7 @@ BootstrapMain(int argc, char *argv[])
306309
AttachSharedMemoryAndSemaphores();
307310
}
308311

309-
if (!IsUnderPostmaster)
312+
if (!IsUnderPostmaster||ExecBackend)
310313
{
311314
if (!potential_DataDir)
312315
{

‎src/backend/postmaster/postmaster.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*
3838
*
3939
* IDENTIFICATION
40-
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.320 2003/05/0303:52:07 momjian Exp $
40+
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.321 2003/05/0305:13:18 momjian Exp $
4141
*
4242
* NOTES
4343
*
@@ -2243,10 +2243,6 @@ BackendFinalize(Port *port)
22432243
/* Reset MyProcPid to new backend's pid */
22442244
MyProcPid=getpid();
22452245

2246-
#ifdefEXEC_BACKEND
2247-
read_nondefault_variables();
2248-
#endif
2249-
22502246
/*
22512247
* Initialize libpq and enable reporting of elog errors to the client.
22522248
* Must do this now because authentication uses libpq to send

‎src/backend/tcop/postgres.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.330 2003/05/0303:52:07 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.331 2003/05/0305:13:20 momjian Exp $
1212
*
1313
* NOTES
1414
* this is the "main" module of the postgres backend and
@@ -1139,9 +1139,12 @@ PostgresMain(int argc, char *argv[], const char *username)
11391139
Noversion= false;
11401140
EchoQuery= false;
11411141

1142-
if (!IsUnderPostmaster)
1142+
if (!IsUnderPostmaster||ExecBackend)
11431143
{
11441144
InitializeGUCOptions();
1145+
#ifdefEXEC_BACKEND
1146+
read_nondefault_variables();
1147+
#endif
11451148
potential_DataDir=getenv("PGDATA");
11461149
}
11471150

@@ -1676,7 +1679,7 @@ PostgresMain(int argc, char *argv[], const char *username)
16761679
if (!IsUnderPostmaster)
16771680
{
16781681
puts("\nPOSTGRES backend interactive interface ");
1679-
puts("$Revision: 1.330 $ $Date: 2003/05/0303:52:07 $\n");
1682+
puts("$Revision: 1.331 $ $Date: 2003/05/0305:13:20 $\n");
16801683
}
16811684

16821685
/*

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp