Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
postgres-lambda-diff
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jakob Huber
postgres-lambda-diff
Commits
77a0219a
Commit
77a0219a
authored
21 years ago
by
Bruce Momjian
Browse files
Options
Downloads
Patches
Plain Diff
Comment out some of the conditional tests until we have exec().
Reorder non-default variable loading until PGDATA is defined.
parent
2cf57c8f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/backend/bootstrap/bootstrap.c
+8
-7
8 additions, 7 deletions
src/backend/bootstrap/bootstrap.c
src/backend/tcop/postgres.c
+7
-6
7 additions, 6 deletions
src/backend/tcop/postgres.c
with
15 additions
and
13 deletions
src/backend/bootstrap/bootstrap.c
+
8
−
7
View file @
77a0219a
...
...
@@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.15
2
2003/05/0
3
0
5
:1
3:18
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.15
3
2003/05/0
6
0
4
:1
6:35
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -236,7 +236,7 @@ BootstrapMain(int argc, char *argv[])
*
* If we are running under the postmaster, this is done already.
*/
if
(
!
IsUnderPostmaster
||
ExecBackend
)
if
(
!
IsUnderPostmaster
/* when exec
|| ExecBackend
*/
)
MemoryContextInit
();
/*
...
...
@@ -245,12 +245,9 @@ BootstrapMain(int argc, char *argv[])
/* Set defaults, to be overriden by explicit options below */
dbName
=
NULL
;
if
(
!
IsUnderPostmaster
||
ExecBackend
)
if
(
!
IsUnderPostmaster
/* when exec
|| ExecBackend
*/
)
{
InitializeGUCOptions
();
#ifdef EXEC_BACKEND
read_nondefault_variables
();
#endif
potential_DataDir
=
getenv
(
"PGDATA"
);
/* Null if no PGDATA
* variable */
}
...
...
@@ -309,7 +306,7 @@ BootstrapMain(int argc, char *argv[])
AttachSharedMemoryAndSemaphores
();
}
if
(
!
IsUnderPostmaster
||
ExecBackend
)
if
(
!
IsUnderPostmaster
/* when exec
|| ExecBackend
*/
)
{
if
(
!
potential_DataDir
)
{
...
...
@@ -328,6 +325,10 @@ BootstrapMain(int argc, char *argv[])
Assert
(
DataDir
);
ValidatePgVersion
(
DataDir
);
#ifdef EXEC_BACKEND
read_nondefault_variables
();
#endif
if
(
IsUnderPostmaster
)
{
/*
...
...
This diff is collapsed.
Click to expand it.
src/backend/tcop/postgres.c
+
7
−
6
View file @
77a0219a
...
...
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.33
3
2003/05/06 0
0:20:33 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.33
4
2003/05/06 0
4:16:35 momjian
Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
...
...
@@ -1803,12 +1803,9 @@ PostgresMain(int argc, char *argv[], const char *username)
Noversion
=
false
;
EchoQuery
=
false
;
if
(
!
IsUnderPostmaster
||
ExecBackend
)
if
(
!
IsUnderPostmaster
/* when exec
|| ExecBackend
*/
)
{
InitializeGUCOptions
();
#ifdef EXEC_BACKEND
read_nondefault_variables
();
#endif
potential_DataDir
=
getenv
(
"PGDATA"
);
}
...
...
@@ -2182,6 +2179,10 @@ PostgresMain(int argc, char *argv[], const char *username)
}
Assert
(
DataDir
);
#ifdef EXEC_BACKEND
read_nondefault_variables
();
#endif
/*
* Set up signal handlers and masks.
*
...
...
@@ -2343,7 +2344,7 @@ PostgresMain(int argc, char *argv[], const char *username)
if
(
!
IsUnderPostmaster
)
{
puts
(
"
\n
POSTGRES backend interactive interface "
);
puts
(
"$Revision: 1.33
3
$ $Date: 2003/05/06 0
0:20
:3
3
$
\n
"
);
puts
(
"$Revision: 1.33
4
$ $Date: 2003/05/06 0
4:16
:3
5
$
\n
"
);
}
/*
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment