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

Commit77a0219

Browse files
committed
Comment out some of the conditional tests until we have exec().
Reorder non-default variable loading until PGDATA is defined.
1 parent2cf57c8 commit77a0219

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

‎src/backend/bootstrap/bootstrap.c‎

Lines changed: 8 additions & 7 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.152 2003/05/03 05:13:18 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.153 2003/05/06 04:16:35 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||ExecBackend)
239+
if (!IsUnderPostmaster/* when exec|| ExecBackend */)
240240
MemoryContextInit();
241241

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

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

312-
if (!IsUnderPostmaster||ExecBackend)
309+
if (!IsUnderPostmaster/* when exec|| ExecBackend*/)
313310
{
314311
if (!potential_DataDir)
315312
{
@@ -328,6 +325,10 @@ BootstrapMain(int argc, char *argv[])
328325
Assert(DataDir);
329326
ValidatePgVersion(DataDir);
330327

328+
#ifdefEXEC_BACKEND
329+
read_nondefault_variables();
330+
#endif
331+
331332
if (IsUnderPostmaster)
332333
{
333334
/*

‎src/backend/tcop/postgres.c‎

Lines changed: 7 additions & 6 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.333 2003/05/0600:20:33 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.334 2003/05/0604:16:35 momjian Exp $
1212
*
1313
* NOTES
1414
* this is the "main" module of the postgres backend and
@@ -1803,12 +1803,9 @@ PostgresMain(int argc, char *argv[], const char *username)
18031803
Noversion= false;
18041804
EchoQuery= false;
18051805

1806-
if (!IsUnderPostmaster||ExecBackend)
1806+
if (!IsUnderPostmaster/* when exec|| ExecBackend*/)
18071807
{
18081808
InitializeGUCOptions();
1809-
#ifdefEXEC_BACKEND
1810-
read_nondefault_variables();
1811-
#endif
18121809
potential_DataDir=getenv("PGDATA");
18131810
}
18141811

@@ -2182,6 +2179,10 @@ PostgresMain(int argc, char *argv[], const char *username)
21822179
}
21832180
Assert(DataDir);
21842181

2182+
#ifdefEXEC_BACKEND
2183+
read_nondefault_variables();
2184+
#endif
2185+
21852186
/*
21862187
* Set up signal handlers and masks.
21872188
*
@@ -2343,7 +2344,7 @@ PostgresMain(int argc, char *argv[], const char *username)
23432344
if (!IsUnderPostmaster)
23442345
{
23452346
puts("\nPOSTGRES backend interactive interface ");
2346-
puts("$Revision: 1.333 $ $Date: 2003/05/0600:20:33 $\n");
2347+
puts("$Revision: 1.334 $ $Date: 2003/05/0604:16:35 $\n");
23472348
}
23482349

23492350
/*

0 commit comments

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