Code review for holdable-cursors patch. Fix error recovery, memory

context sloppiness, some other things.  Includes Neil's mopup patch
of 22-Apr.

2 files changed, 3 insertions, 3 deletions

diff --git a/src/test/regress/expected/portals.out b/src/test/regress/expected/portals.out
index 7520653924..1e69cff969 100644
--- a/src/test/regress/expected/portals.out
+++ b/src/test/regress/expected/portals.out
@@ -675,7 +675,7 @@ CLOSE foo9;
 CLOSE foo10;
 CLOSE foo11;
 CLOSE foo12;
--- is there a reason why we don't close the rest of the open cursors?
+-- leave some cursors open, to test that auto-close works.
 END;
 --
 -- NO SCROLL disallows backward fetching
diff --git a/src/test/regress/sql/portals.sql b/src/test/regress/sql/portals.sql
index 2df820a30a..807c847bc3 100644
--- a/src/test/regress/sql/portals.sql
+++ b/src/test/regress/sql/portals.sql
@@ -166,7 +166,7 @@ CLOSE foo11;
 
 CLOSE foo12;
 
--- is there a reason why we don't close the rest of the open cursors?
+-- leave some cursors open, to test that auto-close works.
 
 END;
 
@@ -217,4 +217,4 @@ DECLARE foo26 CURSOR WITH HOLD FOR SELECT * FROM tenk1;
 ROLLBACK;
 
 -- should fail
-FETCH FROM foo26;
\ No newline at end of file
+FETCH FROM foo26;