diff options
| author | Alvaro Herrera | 2013-02-06 01:46:26 +0000 |
|---|---|---|
| committer | Alvaro Herrera | 2013-02-06 03:19:53 +0000 |
| commit | cb9b66d31ad4bcd37226f20d651a213323621b89 (patch) | |
| tree | 5110f56297f409705ce7268a3d0da16f41a2db6d /src/backend/optimizer | |
| parent | ab0f7b6089fd215f6ce6081e2e222c38d643a526 (diff) | |
Improve error message wording
The wording changes applied in 0ac5ad513 were universally disliked.
Per gripe from Andrew Dunstan
Diffstat (limited to 'src/backend/optimizer')
| -rw-r--r-- | src/backend/optimizer/plan/initsplan.c | 2 | ||||
| -rw-r--r-- | src/backend/optimizer/plan/planner.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c index 11d951cabea..84ca67473bb 100644 --- a/src/backend/optimizer/plan/initsplan.c +++ b/src/backend/optimizer/plan/initsplan.c @@ -883,7 +883,7 @@ make_outerjoininfo(PlannerInfo *root, (jointype == JOIN_FULL && bms_is_member(rc->rti, left_rels))) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("SELECT FOR UPDATE/SHARE/KEY UPDATE/KEY SHARE cannot be applied to the nullable side of an outer join"))); + errmsg("row-level locks cannot be applied to the nullable side of an outer join"))); } sjinfo->syn_lefthand = left_rels; diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 3e75d3994cb..5b97cb5a249 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -1071,7 +1071,7 @@ grouping_planner(PlannerInfo *root, double tuple_fraction) if (parse->rowMarks) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("SELECT FOR UPDATE/SHARE/KEY UPDATE/KEY SHARE is not allowed with UNION/INTERSECT/EXCEPT"))); + errmsg("row-level locks are not allowed with UNION/INTERSECT/EXCEPT"))); /* * Calculate pathkeys that represent result ordering requirements |