aboutsummaryrefslogtreecommitdiff
path: root/src/backend/nodes/outfuncs.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>1998-08-04 16:44:31 +0000
committerBruce Momjian <bruce@momjian.us>1998-08-04 16:44:31 +0000
commitd9be0ff432fe4df419a19fe8319ea6fe6c96e00f (patch)
treedaed63ed5de9e946f9ca20fa2d2f340d5d2ec80d /src/backend/nodes/outfuncs.c
parent7db9ea5c1e8cf4ac6a6032b14cb1eca1fef93adc (diff)
downloadpostgresql-d9be0ff432fe4df419a19fe8319ea6fe6c96e00f.tar.gz
postgresql-d9be0ff432fe4df419a19fe8319ea6fe6c96e00f.zip
MergeSort was sometimes called mergejoin and was confusing. Now
it is now only mergejoin.
Diffstat (limited to 'src/backend/nodes/outfuncs.c')
-rw-r--r--src/backend/nodes/outfuncs.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 693039405ab..f4bd98f4090 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.42 1998/08/01 22:12:08 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.43 1998/08/04 16:43:59 momjian Exp $
*
* NOTES
* Every (plan) node in POSTGRES has an associated "out" routine which
@@ -403,7 +403,7 @@ _outMergeJoin(StringInfo str, MergeJoin *node)
appendStringInfo(str, " :mergeclauses ");
_outNode(str, node->mergeclauses);
- sprintf(buf, " :mergesortop %u ", node->mergesortop);
+ sprintf(buf, " :mergejoinop %u ", node->mergejoinop);
appendStringInfo(str, buf);
sprintf(buf, " :mergerightorder %u ", node->mergerightorder[0]);
@@ -1373,8 +1373,8 @@ _outCInfo(StringInfo str, CInfo *node)
appendStringInfo(str, " :indexids ");
_outNode(str, node->indexids);
- appendStringInfo(str, " :mergesortorder ");
- _outNode(str, node->mergesortorder);
+ appendStringInfo(str, " :mergejoinorder ");
+ _outNode(str, node->mergejoinorder);
sprintf(buf, " :hashjoinoperator %u ", node->hashjoinoperator);
appendStringInfo(str, buf);
@@ -1434,8 +1434,8 @@ _outJInfo(StringInfo str, JInfo *node)
appendStringInfo(str, " :jinfoclauseinfo ");
_outNode(str, node->jinfoclauseinfo);
- appendStringInfo(str, " :mergesortable ");
- appendStringInfo(str, node->mergesortable ? "true" : "false");
+ appendStringInfo(str, " :mergejoinable ");
+ appendStringInfo(str, node->mergejoinable ? "true" : "false");
appendStringInfo(str, " :hashjoinable ");
appendStringInfo(str, node->hashjoinable ? "true" : "false");