Add mention of Christof Petig for ecpg items.

diff --git a/HISTORY b/HISTORY
index f7f6693073467bb397fc701c3d02ba6a5aa3b7b3..efb532d95387b2a14d08878fb00b551e04de328e 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -368,8 +368,8 @@ Changes
 
   ECPG
 
-   EXECUTE ... INTO implemented
-   Multiple row descriptor support (e.g. CARDINALITY)
+   EXECUTE ... INTO implemented (Christof Petig)
+   Multiple row descriptor support (e.g. CARDINALITY) (Christof Petig)
    Fix for GRANT parameters (Lee Kindness)
    Fix INITIALLY DEFERRED bug
    Various bug fixes (Michael, Christof Petig)

diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index f32b85a73978bffd25741ccff4107f4621575946..975e3c0129733be17622d7a1ecdec4ac0dc10f4d 100644 (file)
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.108 2001/12/27 21:10:15 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.109 2001/12/28 05:00:32 momjian Exp $
 -->
 
 <appendix id="release">
@@ -482,8 +482,8 @@ Add more compatibility functions to odbc.sql (Peter E)
    <sect3>
     <title>ECPG</title>
 <literallayout>
-EXECUTE ... INTO implemented
-Multiple row descriptor support (e.g. CARDINALITY)
+EXECUTE ... INTO implemented (Christof Petig)
+Multiple row descriptor support (e.g. CARDINALITY) (Christof Petig)
 Fix for GRANT parameters (Lee Kindness)
 Fix INITIALLY DEFERRED bug
 Various bug fixes (Michael, Christof Petig)

diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
index 4da5bf10cca770c0e0388da5814dfaabef67f1e1..b519af9ec4c9bd15b9f7c93cc2f45b9d55e6db0c 100644 (file)
--- a/src/bin/psql/mainloop.c
+++ b/src/bin/psql/mainloop.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.43 2001/11/05 17:46:31 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.44 2001/12/28 05:00:32 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "mainloop.h"
@@ -447,7 +447,6 @@ MainLoop(FILE *source)
                        {
                                const char *end_of_cmd = NULL;
 
-                               paren_level = 0;
                                line[i - prevlen] = '\0';               /* overwrites backslash */
 
                                /* is there anything else on the line for the command? */
@@ -470,6 +469,9 @@ MainLoop(FILE *source)
 
                                success = slashCmdStatus != CMD_ERROR;
 
+                               if (query_buf->len == 0)
+                                       paren_level = 0;
+
                                if ((slashCmdStatus == CMD_SEND || slashCmdStatus == CMD_NEWEDIT) &&
                                        query_buf->len == 0)
                                {