diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-08-04 16:44:31 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-08-04 16:44:31 +0000 |
| commit | d9be0ff432fe4df419a19fe8319ea6fe6c96e00f (patch) | |
| tree | daed63ed5de9e946f9ca20fa2d2f340d5d2ec80d /src/backend/nodes/copyfuncs.c | |
| parent | 7db9ea5c1e8cf4ac6a6032b14cb1eca1fef93adc (diff) | |
| download | postgresql-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/copyfuncs.c')
| -rw-r--r-- | src/backend/nodes/copyfuncs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index fbaa1298c36..ac88763601e 100644 --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.45 1998/08/01 22:12:05 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.46 1998/08/04 16:43:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -335,7 +335,7 @@ _copyMergeJoin(MergeJoin *from) */ Node_Copy(from, newnode, mergeclauses); - newnode->mergesortop = from->mergesortop; + newnode->mergejoinop = from->mergejoinop; newnode->mergerightorder = (Oid *) palloc(sizeof(Oid) * 2); newnode->mergerightorder[0] = from->mergerightorder[0]; @@ -1334,7 +1334,7 @@ _copyCInfo(CInfo *from) newnode->notclause = from->notclause; Node_Copy(from, newnode, indexids); - Node_Copy(from, newnode, mergesortorder); + Node_Copy(from, newnode, mergejoinorder); newnode->hashjoinoperator = from->hashjoinoperator; newnode->cinfojoinid = listCopy(from->cinfojoinid); @@ -1424,7 +1424,7 @@ _copyJInfo(JInfo *from) newnode->otherrels = listCopy(from->otherrels); Node_Copy(from, newnode, jinfoclauseinfo); - newnode->mergesortable = from->mergesortable; + newnode->mergejoinable = from->mergejoinable; newnode->hashjoinable = from->hashjoinable; newnode->inactive = from->inactive; |