aboutsummaryrefslogtreecommitdiff
path: root/src/backend/executor/nodeMergejoin.c
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2003-09-25 06:58:07 +0000
committerPeter Eisentraut <peter_e@gmx.net>2003-09-25 06:58:07 +0000
commitfeb4f44d296b88b7f0723f4a4f3945a371276e0b (patch)
tree6acfa253cd3896fa96124fdcefdbc8e5cb5bb0da /src/backend/executor/nodeMergejoin.c
parent42013caf648ad4bd64b130efda760cdb1620e953 (diff)
downloadpostgresql-feb4f44d296b88b7f0723f4a4f3945a371276e0b.tar.gz
postgresql-feb4f44d296b88b7f0723f4a4f3945a371276e0b.zip
Message editing: remove gratuitous variations in message wording, standardize
terms, add some clarifications, fix some untranslatable attempts at dynamic message building.
Diffstat (limited to 'src/backend/executor/nodeMergejoin.c')
-rw-r--r--src/backend/executor/nodeMergejoin.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c
index 0b383d24d1a..36b8c454702 100644
--- a/src/backend/executor/nodeMergejoin.c
+++ b/src/backend/executor/nodeMergejoin.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.61 2003/08/08 21:41:42 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.62 2003/09/25 06:57:59 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1476,7 +1476,7 @@ ExecInitMergeJoin(MergeJoin *node, EState *estate)
if (node->join.joinqual != NIL)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
- errmsg("RIGHT JOIN is only supported with mergejoinable join conditions")));
+ errmsg("RIGHT JOIN is only supported with merge-joinable join conditions")));
break;
case JOIN_FULL:
mergestate->mj_NullOuterTupleSlot =
@@ -1493,7 +1493,7 @@ ExecInitMergeJoin(MergeJoin *node, EState *estate)
if (node->join.joinqual != NIL)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
- errmsg("FULL JOIN is only supported with mergejoinable join conditions")));
+ errmsg("FULL JOIN is only supported with merge-joinable join conditions")));
break;
default:
elog(ERROR, "unrecognized join type: %d",