diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1996-07-23 02:23:54 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1996-07-23 02:23:54 +0000 |
| commit | 7344d6989878ff313d65a6ec15b6ed027b47e248 (patch) | |
| tree | 236c86b0cc4ea9d920cbdf85f32780842a488fd7 /src/backend/bootstrap/bootstrap.c | |
| parent | e11744e164c6fc3d10954bf1e2cf1f0b72804330 (diff) | |
| download | postgresql-7344d6989878ff313d65a6ec15b6ed027b47e248.tar.gz postgresql-7344d6989878ff313d65a6ec15b6ed027b47e248.zip | |
Finished merging in src/backend from Dr. George's source tree
Diffstat (limited to 'src/backend/bootstrap/bootstrap.c')
| -rw-r--r-- | src/backend/bootstrap/bootstrap.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index e292ded1d8d..d8dff690515 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -7,7 +7,7 @@ * Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.3 1996/07/16 07:12:27 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.4 1996/07/23 02:23:05 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -137,7 +137,7 @@ AttributeTupleForm attrtypes[MAXATTR]; /* points to attribute info */ static char *values[MAXATTR]; /* cooresponding attribute values */ int numattr; /* number of attributes for cur. rel */ #ifdef OPENLINK_PATCHES -extern int fsyncOff; /* do not fsync the database */ +extern int fsyncOff; /* do not fsync the database */ #endif #if defined(WIN32) || defined(PORTNAME_next) @@ -187,7 +187,9 @@ typedef void (*sig_func)(); * error handling / abort routines * ---------------- */ -#if !defined(PORTNAME_bsdi) && !defined(PORTNAME_bsdi_2_1) +# if !defined(PORTNAME_BSD44_derived) && \ + !defined(PORTNAME_bsdi) && \ + !defined(PORTNAME_bsdi_2_1) void err() { Warnings++; @@ -266,7 +268,7 @@ BootstrapMain(int argc, char *argv[]) Quiet = 0; Noversion = 0; dbName = NULL; - + #ifdef OPENLINK_PATCHES while ((flag = getopt(argc, argv, "dCOQP:F")) != EOF) { #else @@ -279,6 +281,11 @@ BootstrapMain(int argc, char *argv[]) case 'C': Noversion = 1; break; +#ifdef OPENLINK_PATCHES + case 'F': + fsyncOff = 1; + break; +#endif case 'O': override = true; break; @@ -288,12 +295,6 @@ BootstrapMain(int argc, char *argv[]) case 'P':/* specify port */ portFd = atoi(optarg); break; -#ifdef OPENLINK_PATCHES - case 'F': - fsyncOff = 1; - break; -#endif - break; default: usage(); break; |