Cleanup global variables, remove stable memory stuff.

4 files changed, 16 insertions, 27 deletions

diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 4b802875f47..dc593264ced 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.40 1997/08/12 20:15:49 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.41 1997/08/14 16:11:15 momjian Exp $
  *
  * NOTES
  *    this is the "main" module of the postgres backend and
@@ -107,10 +107,7 @@ extern int      lockDebug;
 extern int      lockingOff;
 extern int      NBuffers;
 
-int     fsyncOff = 0;
-int	SortMem = 512;
-
-int     dontExecute = 0;
+int             dontExecute = 0;
 static int      ShowStats;
 static bool     IsEmptyQuery = false;
 
@@ -782,7 +779,7 @@ static void usage(char* progname)
     fprintf(stderr, "    p: backend started by postmaster\n");
     fprintf(stderr, "    P: set port file descriptor\n");
     fprintf(stderr, "    Q: suppress informational messages\n");
-    fprintf(stderr, "    S: assume stable main memory\n");
+    fprintf(stderr, "    S: set amount of sort memory available\n");
     fprintf(stderr, "    s: show stats after each query\n");
     fprintf(stderr, "    t: trace component execution times\n");
     fprintf(stderr, "    T: execute all possible plans for each query\n");
@@ -800,7 +797,6 @@ PostgresMain(int argc, char *argv[])
 {
     int    flagC;
     int    flagQ;
-    int    flagS;
     int    flagE;
     int    flagEu;
     int    flag;
@@ -855,7 +851,7 @@ PostgresMain(int argc, char *argv[])
      *  parse command line arguments
      * ----------------
      */
-    flagC = flagQ = flagS = flagE = flagEu = ShowStats = 0;
+    flagC = flagQ = flagE = flagEu = ShowStats = 0;
     ShowParserStats = ShowPlannerStats = ShowExecutorStats = 0;
 #ifdef LOCK_MGR_DEBUG
     lockDebug = 0;
@@ -1047,18 +1043,6 @@ PostgresMain(int argc, char *argv[])
              */
             SortMem = atoi(optarg);
             break;
-
-#ifdef NOT_USED
-        case 'S':
-            /* ----------------
-             *  S - assume stable main memory
-             *      (don't flush all pages at end transaction)
-             * ----------------
-             */
-            flagS = 1;
-            SetTransactionFlushEnabled(false);
-            break;
-#endif
             
         case 's':
             /* ----------------
@@ -1180,7 +1164,6 @@ PostgresMain(int argc, char *argv[])
         puts("\t---debug info---");
         printf("\tQuiet =        %c\n", Quiet     ? 't' : 'f');
         printf("\tNoversion =    %c\n", Noversion ? 't' : 'f');
-        printf("\tstable    =    %c\n", flagS     ? 't' : 'f');
         printf("\ttimings   =    %c\n", ShowStats ? 't' : 'f');
         printf("\tdates     =    %s\n", EuroDates ? "European" : "Normal");
         printf("\tbufsize   =    %d\n", NBuffers);
@@ -1292,11 +1275,11 @@ PostgresMain(int argc, char *argv[])
      */
     if (IsUnderPostmaster == false) {
         puts("\nPOSTGRES backend interactive interface");
-        puts("$Revision: 1.40 $ $Date: 1997/08/12 20:15:49 $");
+        puts("$Revision: 1.41 $ $Date: 1997/08/14 16:11:15 $");
     }
     
     /* ----------------
-     * if stable main memory is assumed (-S flag is set), it is necessary
+     * if stable main memory is assumed (-S(old) flag is set), it is necessary
      * to flush all dirty shared buffers before exit
      * plai 8/7/90
      * ----------------
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
index ddbe67b624f..053bcbb8775 100644
--- a/src/backend/utils/init/globals.c
+++ b/src/backend/utils/init/globals.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.9 1997/03/28 07:18:06 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.10 1997/08/14 16:11:21 momjian Exp $
  *
  * NOTES
  *    Globals used all over the place should be declared here and not
@@ -75,6 +75,9 @@ char		CTZName[MAXTZLEN+1] = "";
 char DateFormat[20] 	= "%d-%m-%Y";	/* mjl: sizes! or better malloc? XXX */
 char FloatFormat[20] = "%f";
 
+int     	fsyncOff = 0;
+int		SortMem = 512;
+
 char *IndexedCatalogNames[] = {
     AttributeRelationName,
     ProcedureRelationName,
diff --git a/src/backend/utils/sort/psort.c b/src/backend/utils/sort/psort.c
index 330d83ab456..f49e98973de 100644
--- a/src/backend/utils/sort/psort.c
+++ b/src/backend/utils/sort/psort.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.14 1997/08/14 05:04:38 vadim Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.15 1997/08/14 16:11:28 momjian Exp $
  *
  * NOTES
  *      Sorts the first relation into the second relation.
@@ -61,11 +61,11 @@
 #include "utils/lselect.h"
 #include "utils/psort.h"
 
+#include "miscadmin.h"
 #include "storage/fd.h"
 
 #define	TEMPDIR	"./"
 
-extern 		int	SortMem;	/* defined as postgres option */
 static  	long	shortzero = 0;	/* used to delimit runs */
 
 /*
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 3792a7cf850..e579a6dcd8e 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -11,7 +11,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: miscadmin.h,v 1.9 1997/04/27 19:21:06 thomas Exp $
+ * $Id: miscadmin.h,v 1.10 1997/08/14 16:11:41 momjian Exp $
  *
  * NOTES
  *    some of the information in this file will be moved to
@@ -89,6 +89,9 @@ extern char	    CTZName[];
 extern char FloatFormat[];
 extern char DateFormat[];
 
+extern int	    fsyncOff;
+extern int	    SortMem;
+
 extern Oid	    LastOidProcessed;	/* for query rewrite */
 
 #define MAX_PARSE_BUFFER 8192