diff options
Diffstat (limited to 'src/backend/executor')
| -rw-r--r-- | src/backend/executor/execMain.c | 10 | ||||
| -rw-r--r-- | src/backend/executor/execQual.c | 6 | ||||
| -rw-r--r-- | src/backend/executor/nodeSetOp.c | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 7f6c8253807..7a0ba7d2960 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -26,7 +26,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.210 2003/07/21 17:05:08 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.211 2003/07/28 00:09:14 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1117,7 +1117,7 @@ lnext: ; if (XactIsoLevel == XACT_SERIALIZABLE) ereport(ERROR, (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE), - errmsg("cannot serialize access due to concurrent update"))); + errmsg("could not serialize access due to concurrent update"))); if (!(ItemPointerEquals(&(tuple.t_self), (ItemPointer) DatumGetPointer(datum)))) { @@ -1416,7 +1416,7 @@ ldelete:; if (XactIsoLevel == XACT_SERIALIZABLE) ereport(ERROR, (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE), - errmsg("cannot serialize access due to concurrent update"))); + errmsg("could not serialize access due to concurrent update"))); else if (!(ItemPointerEquals(tupleid, &ctid))) { TupleTableSlot *epqslot = EvalPlanQual(estate, @@ -1550,7 +1550,7 @@ lreplace:; if (XactIsoLevel == XACT_SERIALIZABLE) ereport(ERROR, (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE), - errmsg("cannot serialize access due to concurrent update"))); + errmsg("could not serialize access due to concurrent update"))); else if (!(ItemPointerEquals(tupleid, &ctid))) { TupleTableSlot *epqslot = EvalPlanQual(estate, @@ -1737,7 +1737,7 @@ EvalPlanQual(EState *estate, Index rti, ItemPointer tid) } } if (relation == NULL) - elog(ERROR, "cannot find RowMark for RT index %u", rti); + elog(ERROR, "could not find RowMark for RT index %u", rti); } /* diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c index dad12acb783..c65844b0f89 100644 --- a/src/backend/executor/execQual.c +++ b/src/backend/executor/execQual.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.135 2003/07/21 17:05:08 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.136 2003/07/28 00:09:14 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -533,7 +533,7 @@ GetAttributeByNum(TupleTableSlot *slot, Datum retval; if (!AttributeNumberIsValid(attrno)) - elog(ERROR, "invalid attribute number: %d", attrno); + elog(ERROR, "invalid attribute number %d", attrno); if (isNull == (bool *) NULL) elog(ERROR, "a NULL isNull pointer was passed"); @@ -616,7 +616,7 @@ init_fcache(Oid foid, FuncExprState *fcache, MemoryContext fcacheCxt) /* Safety check (should never fail, as parser should check sooner) */ if (length(fcache->args) > FUNC_MAX_ARGS) - elog(ERROR, "too many arguments to function"); + elog(ERROR, "too many arguments"); /* Set up the primary fmgr lookup information */ fmgr_info_cxt(foid, &(fcache->func), fcacheCxt); diff --git a/src/backend/executor/nodeSetOp.c b/src/backend/executor/nodeSetOp.c index 7917744dd93..bae8f0116bc 100644 --- a/src/backend/executor/nodeSetOp.c +++ b/src/backend/executor/nodeSetOp.c @@ -21,7 +21,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeSetOp.c,v 1.10 2003/07/21 17:05:10 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeSetOp.c,v 1.11 2003/07/28 00:09:15 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -170,7 +170,7 @@ ExecSetOp(SetOpState *node) 0 : (node->numLeft - node->numRight); break; default: - elog(ERROR, "unrecognized setop code: %d", + elog(ERROR, "unrecognized set op: %d", (int) plannode->cmd); break; } |