No more SortTuplesInTree...

diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index b5aec218c7a29e92dcc98d0f6963dbe8a4c571bf..4726071aaf0c66ddb5acfe7d7d83a39be6de3ee5 100644 (file)
--- 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.47 1997/09/18 05:19:17 vadim Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.48 1997/09/18 14:33:33 vadim Exp $
  *
  * NOTES
  *       this is the "main" module of the postgres backend and
@@ -1120,31 +1120,15 @@ PostgresMain(int argc, char *argv[])
 
                        case 'S':
                                /* ----------------
-                                *      S - amount of sort memory to use in 1k bytes and
-                                *              (optional) max number of tuples in leftist tree
+                                *      S - amount of sort memory to use in 1k bytes
                                 * ----------------
                                 */
                                {
                                        int S;
-                                       char *p = strchr (optarg, ',');
                                        
-                                       if ( p != NULL )
-                                       {
-                                               *p = 0;
-                                               S = atoi(optarg);
-                                               if ( S >= 4*MAXBLCKSZ/1024 )
-                                                       SortMem = S;
-                                               S = atoi (p + 1);
-                                               if ( S >= 32 )
-                                                       SortTuplesInTree = S;
-                                               *p = ',';
-                                       }
-                                       else
-                                       {
-                                               S = atoi(optarg);
-                                               if ( S >= 4*MAXBLCKSZ/1024 )
-                                                       SortMem = S;
-                                       }
+                                       S = atoi(optarg);
+                                       if ( S >= 4*MAXBLCKSZ/1024 )
+                                               SortMem = S;
                                }
                                break;
 
@@ -1407,7 +1391,7 @@ PostgresMain(int argc, char *argv[])
        if (IsUnderPostmaster == false)
        {
                puts("\nPOSTGRES backend interactive interface");
-               puts("$Revision: 1.47 $ $Date: 1997/09/18 05:19:17 $");
+               puts("$Revision: 1.48 $ $Date: 1997/09/18 14:33:33 $");
        }
 
        /* ----------------

diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
index f1a521d041317d9ebf62a4077c75635bad46685b..7f2aefe3d6f90c478dd893983ba0b5b1f1f13593 100644 (file)
--- 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.13 1997/09/18 05:23:58 vadim Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.14 1997/09/18 14:33:46 vadim Exp $
  *
  * NOTES
  *       Globals used all over the place should be declared here and not
@@ -80,7 +80,6 @@ char          FloatFormat[20] = "%f";
 
 int                    fsyncOff = 0;
 int                    SortMem = 512;
-int                    SortTuplesInTree = 2560;
 
 char      *IndexedCatalogNames[] = {
        AttributeRelationName,