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/readfuncs.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/readfuncs.c')
| -rw-r--r-- | src/backend/nodes/readfuncs.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c index 61032aaaa50..69f90fb126b 100644 --- a/src/backend/nodes/readfuncs.c +++ b/src/backend/nodes/readfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.34 1998/08/01 22:12:09 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.35 1998/08/04 16:44:00 momjian Exp $ * * NOTES * Most of the read functions for plan nodes are tested. (In fact, they @@ -407,9 +407,9 @@ _readMergeJoin() token = lsptok(NULL, &length); /* eat :mergeclauses */ local_node->mergeclauses = nodeRead(true); /* now read it */ - token = lsptok(NULL, &length); /* eat :mergesortop */ - token = lsptok(NULL, &length); /* get mergesortop */ - local_node->mergesortop = atol(token); + token = lsptok(NULL, &length); /* eat :mergejoinop */ + token = lsptok(NULL, &length); /* get mergejoinop */ + local_node->mergejoinop = atol(token); return (local_node); } @@ -1794,8 +1794,8 @@ _readCInfo() token = lsptok(NULL, &length); /* get :indexids */ local_node->indexids = nodeRead(true); /* now read it */ - token = lsptok(NULL, &length); /* get :mergesortorder */ - local_node->mergesortorder = (MergeOrder *) nodeRead(true); + token = lsptok(NULL, &length); /* get :mergejoinorder */ + local_node->mergejoinorder = (MergeOrder *) nodeRead(true); token = lsptok(NULL, &length); /* get :hashjoinoperator */ token = lsptok(NULL, &length); /* now read it */ @@ -1880,12 +1880,12 @@ _readJInfo() token = lsptok(NULL, &length); /* get :jinfoclauseinfo */ local_node->jinfoclauseinfo = nodeRead(true); /* now read it */ - token = lsptok(NULL, &length); /* get :mergesortable */ + token = lsptok(NULL, &length); /* get :mergejoinable */ if (!strncmp(token, "true", 4)) - local_node->mergesortable = true; + local_node->mergejoinable = true; else - local_node->mergesortable = false; + local_node->mergejoinable = false; token = lsptok(NULL, &length); /* get :hashjoinable */ |