From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Mon, 29 Mar 2021 21:34:39 +0000 (-0300)
Subject: psql: call clearerr() just before printing
X-Git-Tag: REL_13_3~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f50dc2c725fd546b994f228101211ae50e6858e5;p=thirdparty%2Fpostgresql.git

psql: call clearerr() just before printing

We were never doing clearerr() on the output stream, which results in a
message being printed after each result once an EOF is seen:

could not print result table: Success

This message was added by commit b03436994bcc (in the pg13 era); before
that, the error indicator would never be examined.  So backpatch only
that far back, even though the actual bug (to wit: the fact that the
error indicator is never cleared) is older.
---

diff --git a/src/fe_utils/print.c b/src/fe_utils/print.c
index 66a50f183f5..f3c176aa555 100644
--- a/src/fe_utils/print.c
+++ b/src/fe_utils/print.c
@@ -3347,6 +3347,9 @@ printTable(const printTableContent *cont,
 		is_local_pager = is_pager;
 	}
 
+	/* clear any pre-existing error indication on the output stream */
+	clearerr(fout);
+
 	/* print the stuff */
 
 	if (flog)