From deab9274700aad030fe03a246136450491d51afb Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 28 Dec 2001 05:00:32 +0000
Subject: [PATCH] Add mention of Christof Petig for ecpg items.
---
HISTORY | 4 ++--
doc/src/sgml/release.sgml | 6 +++---
src/bin/psql/mainloop.c | 6 ++++--
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/HISTORY b/HISTORY
index f7f66930734..efb532d9538 100644
--- 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 f32b85a7397..975e3c01297 100644
--- 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 4da5bf10cca..b519af9ec4c 100644
--- 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)
{
--
GitLab