From d9be0ff432fe4df419a19fe8319ea6fe6c96e00f Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 4 Aug 1998 16:44:31 +0000
Subject: MergeSort was sometimes called mergejoin and was confusing.  Now it
 is now only mergejoin.

---
 src/backend/tcop/postgres.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/backend/tcop/postgres.c')

diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 8e66175e4af..f158a0f1003 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.81 1998/07/26 04:30:46 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.82 1998/08/04 16:44:20 momjian Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -977,7 +977,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 						_enable_nestloop_ = false;
 						break;
 					case 'm':	/* mergejoin */
-						_enable_mergesort_ = false;
+						_enable_mergejoin_ = false;
 						break;
 					case 'h':	/* hashjoin */
 						_enable_hashjoin_ = false;
@@ -1339,7 +1339,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface");
-		puts("$Revision: 1.81 $ $Date: 1998/07/26 04:30:46 $");
+		puts("$Revision: 1.82 $ $Date: 1998/08/04 16:44:20 $");
 	}
 
 	/* ----------------
-- 
cgit v1.2.3