database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-30 21:42:05 +03:00
Code Activity

Finished merging in src/backend from Dr. George's source tree

Browse Source
This commit is contained in:
Marc G. Fournier
1996-07-23 02:23:54 +00:00
parent e11744e164
commit 7344d69898
9 changed files with 150 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/backend/bootstrap/bootstrap.c
View File

@ -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;