summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian1999-12-29 22:57:17 +0000
committerBruce Momjian1999-12-29 22:57:17 +0000
commit649ffe161653f2e3f181f616de62ccc467d8c879 (patch)
treea37cf703dd391417e3dceec367a7446cc5735c7e
parente1b212ff3b6cc0d16dee109d5f900536f78023e3 (diff)
Improve subquery error message, now says "More than one tuple returned
by subselect used as expression."
-rw-r--r--doc/README.NT7
-rw-r--r--src/backend/executor/nodeSubplan.c6
2 files changed, 3 insertions, 10 deletions
diff --git a/doc/README.NT b/doc/README.NT
index a789c5184fc..4739e3f2ff2 100644
--- a/doc/README.NT
+++ b/doc/README.NT
@@ -1,10 +1,3 @@
-From: "Joost Kraaijeveld" <[email protected]>
-To: "Pgsql-Ports@Postgresql. Org" <[email protected]>
-Subject: RE: [PORTS] Re: psql under win32
-Date: Wed, 21 Apr 1999 07:07:47 +0200
-Message-ID: <[email protected]>
-MIME-Version: 1.0
-
Installing PostgreSQL on NT:
---------------------------------------------------------------------------
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c
index 60b484d708b..0d41de06d4c 100644
--- a/src/backend/executor/nodeSubplan.c
+++ b/src/backend/executor/nodeSubplan.c
@@ -6,7 +6,7 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeSubplan.c,v 1.18 1999/12/16 22:19:44 wieck Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeSubplan.c,v 1.19 1999/12/29 22:57:17 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -105,7 +105,7 @@ ExecSubPlan(SubPlan *node, List *pvar, ExprContext *econtext, bool *isNull)
{
/* cannot allow multiple input tuples for EXPR sublink */
if (found)
- elog(ERROR, "ExecSubPlan: more than one tuple returned by expression subselect");
+ elog(ERROR, "More than one tuple returned by subselect used as expression.");
found = true;
/*
* We need to copy the subplan's tuple in case the result is of
@@ -126,7 +126,7 @@ ExecSubPlan(SubPlan *node, List *pvar, ExprContext *econtext, bool *isNull)
/* cannot allow multiple input tuples for MULTIEXPR sublink either */
if (subLinkType == MULTIEXPR_SUBLINK && found)
- elog(ERROR, "ExecSubPlan: more than one tuple returned by expression subselect");
+ elog(ERROR, "More than one tuple returned by subselect used as expression.");
found = true;