aboutsummaryrefslogtreecommitdiff
path: root/src/backend/tcop/postgres.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>1996-11-04 04:53:51 +0000
committerBruce Momjian <bruce@momjian.us>1996-11-04 04:53:51 +0000
commit18bbad7696ca9f9a1fae646b73f71509dd0d5342 (patch)
treea98bf9ccd03f383632c25b3225baf4aa4a606605 /src/backend/tcop/postgres.c
parent0108fddf13eaaf90056f01e37d95b0f8966f8585 (diff)
downloadpostgresql-18bbad7696ca9f9a1fae646b73f71509dd0d5342.tar.gz
postgresql-18bbad7696ca9f9a1fae646b73f71509dd0d5342.zip
Remove OPENLINK define
Diffstat (limited to 'src/backend/tcop/postgres.c')
-rw-r--r--src/backend/tcop/postgres.c20
1 files changed, 3 insertions, 17 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 43d7e6a59bb..c5e1ef8ec8f 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.13 1996/11/03 06:52:33 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.14 1996/11/04 04:53:31 momjian Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -92,9 +92,7 @@ CommandDest whereToSendOutput;
extern int lockingOff;
extern int NBuffers;
-#ifdef OPENLINK_PATCHES
int fsyncOff = 0;
-#endif
int dontExecute = 0;
static int ShowStats;
@@ -742,22 +740,16 @@ her exceeded legal ranges or was a divide by zero");
static void usage(char* progname)
{
-#ifdef OPENLINK_PATCHES
- fprintf(stderr,"\t[-P portno] [-t tracetype] [-x opttype] [-bCEiLFNopQSs] [dbname]\n");
-#else
fprintf(stderr,
"Usage: %s [-B nbufs] [-d lvl] ] [-f plantype] \t[-m portno] [\t -o filename]\n",
progname);
- fprintf(stderr,"\t[-P portno] [-t tracetype] [-x opttype] [-bCEiLNopQSs] [dbname]\n");
-#endif
+ fprintf(stderr,"\t[-P portno] [-t tracetype] [-x opttype] [-bCEiLFNopQSs] [dbname]\n");
fprintf(stderr, " b: consider bushy plan trees during optimization\n");
fprintf(stderr, " B: set number of buffers in buffer pool\n");
fprintf(stderr, " C: supress version info\n");
fprintf(stderr, " d: set debug level\n");
fprintf(stderr, " E: echo query before execution\n");
-#ifdef OPENLINK_PATCHES
fprintf(stderr, " F: turn off fsync\n");
-#endif
fprintf(stderr, " f: forbid plantype generation\n");
fprintf(stderr, " i: don't execute the query, just show the plan tree\n");
fprintf(stderr, " L: turn off locking\n");
@@ -857,11 +849,7 @@ PostgresMain(int argc, char *argv[])
hostName = hostbuf;
}
-#ifdef OPENLINK_PATCHES
while ((flag = getopt(argc, argv, "B:bCd:Ef:iLm:MNo:P:pQSst:x:F")) != EOF)
-#else
- while ((flag = getopt(argc, argv, "B:bCd:Ef:iLm:MNo:P:pQSst:x:")) != EOF)
-#endif
switch (flag) {
case 'b':
@@ -908,7 +896,6 @@ PostgresMain(int argc, char *argv[])
flagE = 1;
break;
-#ifdef OPENLINK_PATCHES
case 'F':
/* --------------------
* turn off fsync
@@ -916,7 +903,6 @@ PostgresMain(int argc, char *argv[])
*/
fsyncOff = 1;
break;
-#endif
case 'f':
/* -----------------
@@ -1264,7 +1250,7 @@ PostgresMain(int argc, char *argv[])
*/
if (IsUnderPostmaster == false) {
puts("\nPOSTGRES backend interactive interface");
- puts("$Revision: 1.13 $ $Date: 1996/11/03 06:52:33 $");
+ puts("$Revision: 1.14 $ $Date: 1996/11/04 04:53:31 $");
}
/* ----------------