diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2001-10-19 17:03:08 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2001-10-19 17:03:08 +0000 |
| commit | 6430e6e2831dc35a6e45bf09baac8c0c212d71d7 (patch) | |
| tree | e5234f3c880c5c4b9b9bd500beb11adc0918ccf7 /src/backend/tcop/postgres.c | |
| parent | 3d510653a4fab918451083b83ad4b667406ccda4 (diff) | |
| download | postgresql-6430e6e2831dc35a6e45bf09baac8c0c212d71d7.tar.gz postgresql-6430e6e2831dc35a6e45bf09baac8c0c212d71d7.zip | |
Ensure that all startup paths (postmaster, standalone postgres, or
bootstrap) check for a valid PG_VERSION file before looking at anything
else in the data directory. This fixes confusing error report when
trying to start current sources in a pre-7.1 data directory.
Per trouble report from Rich Shepard 10/18/01.
Diffstat (limited to 'src/backend/tcop/postgres.c')
| -rw-r--r-- | src/backend/tcop/postgres.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index bd51a57ab54..95d4b9e8c15 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.235 2001/10/19 00:44:08 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.236 2001/10/19 17:03:08 tgl Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -1584,6 +1584,12 @@ PostgresMain(int argc, char *argv[], } /* + * Validate we have been given a reasonable-looking DataDir + * (if under postmaster, assume postmaster did this already). + */ + ValidatePgVersion(DataDir); + + /* * Create lockfile for data directory. */ if (!CreateDataDirLockFile(DataDir, false)) @@ -1645,7 +1651,7 @@ PostgresMain(int argc, char *argv[], if (!IsUnderPostmaster) { puts("\nPOSTGRES backend interactive interface "); - puts("$Revision: 1.235 $ $Date: 2001/10/19 00:44:08 $\n"); + puts("$Revision: 1.236 $ $Date: 2001/10/19 17:03:08 $\n"); } /* |