diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2000-07-02 15:21:27 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2000-07-02 15:21:27 +0000 |
| commit | 6fb9d2e347b14445b85d6c97f7d16527d41ccce6 (patch) | |
| tree | b75bd707655a8abeca16f69ed58f9391d5308c5c /src/backend/utils/init/postinit.c | |
| parent | 07dfe9773127d82a960101a5a18bd9393dff0d40 (diff) | |
| download | postgresql-6fb9d2e347b14445b85d6c97f7d16527d41ccce6.tar.gz postgresql-6fb9d2e347b14445b85d6c97f7d16527d41ccce6.zip | |
Version number now set in configure, available through Makefile.global
and config.h. Adjusted all referring code.
Scrapped pg_version and changed initdb accordingly. Integrated
src/utils/version.c into src/backend/utils/init/miscinit.c. Changed all
callers.
Set version number to `7.1devel'. (Non-numeric version suffixes now allowed.)
Diffstat (limited to 'src/backend/utils/init/postinit.c')
| -rw-r--r-- | src/backend/utils/init/postinit.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index f2a5864666c..813eb131174 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.60 2000/06/28 03:32:43 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.61 2000/07/02 15:20:56 petere Exp $ * * *------------------------------------------------------------------------- @@ -34,7 +34,6 @@ #include "utils/portal.h" #include "utils/relcache.h" #include "utils/syscache.h" -#include "version.h" #ifdef MULTIBYTE #include "mb/pg_wchar.h" @@ -267,9 +266,7 @@ InitPostgres(const char *dbname) elog(FATAL, "Database system not found. Data directory '%s' does not exist.", DataDir); - ValidatePgVersion(DataDir, &reason); - if (reason != NULL) - elog(FATAL, reason); + ValidatePgVersion(DataDir); /*----------------- * Find oid and path of the database we're about to open. Since we're @@ -300,9 +297,7 @@ InitPostgres(const char *dbname) elog(FATAL, "Database \"%s\" does not exist. The data directory '%s' is missing.", dbname, fullpath); - ValidatePgVersion(fullpath, &reason); - if (reason != NULL) - elog(FATAL, "%s", reason); + ValidatePgVersion(fullpath); if (chdir(fullpath) == -1) elog(FATAL, "Unable to change directory to '%s': %s", fullpath, strerror(errno)); |