aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/pl/plpgsql/src/gram.y13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/pl/plpgsql/src/gram.y b/src/pl/plpgsql/src/gram.y
index d1823d7a091..e1ba564ca90 100644
--- a/src/pl/plpgsql/src/gram.y
+++ b/src/pl/plpgsql/src/gram.y
@@ -4,7 +4,7 @@
* procedural language
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.73 2005/06/07 02:47:16 neilc Exp $
+ * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.74 2005/06/08 00:49:36 neilc Exp $
*
* This software is copyrighted by Jan Wieck - Hamburg.
*
@@ -1263,13 +1263,12 @@ stmt_dynexecute : K_EXECUTE lno
new->cmd_type = PLPGSQL_STMT_DYNEXECUTE;
new->lineno = $2;
new->query = expr;
-
new->rec = NULL;
new->row = NULL;
/*
- * If we saw "INTO", look for an additional
- * row or record var.
+ * If we saw "INTO", look for a following row
+ * var, record var, or list of scalars.
*/
if (endtoken == K_INTO)
{
@@ -1293,9 +1292,9 @@ stmt_dynexecute : K_EXECUTE lno
plpgsql_error_lineno = $2;
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("syntax error at \"%s\"",
- yytext),
- errdetail("Expected record or row variable.")));
+ errmsg("syntax error at \"%s\"", yytext),
+ errdetail("Expected record variable, row variable, "
+ "or list of scalar variables.")));
}
if (yylex() != ';')
yyerror("syntax error");