From 84d723b6cefcf25b8c800f8aa6cf3c9538a546b4 Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas
Date: Tue, 29 Dec 2009 17:40:59 +0000
Subject: Previous fix for temporary file management broke returning a set from
 PL/pgSQL function within an exception handler. Make sure we use the right
 resource owner when we create the tuplestore to hold returned tuples.

Simplify tuplestore API so that the caller doesn't need to be in the right
memory context when calling tuplestore_put* functions. tuplestore.c
automatically switches to the memory context used when the tuplestore was
created. Tuplesort was already modified like this earlier. This patch also
removes the now useless MemoryContextSwitch calls from callers.

Report by Aleksei on pgsql-bugs on Dec 22 2009. Backpatch to 8.1, like
the previous patch that broke this.
---
 contrib/xml2/xpath.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'contrib/xml2')

diff --git a/contrib/xml2/xpath.c b/contrib/xml2/xpath.c
index 203e53905be..a003dd00c82 100644
--- a/contrib/xml2/xpath.c
+++ b/contrib/xml2/xpath.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/xml2/xpath.c,v 1.23 2009/06/11 14:48:53 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/xml2/xpath.c,v 1.24 2009/12/29 17:40:59 heikki Exp $
  *
  * Parser interface for DOM-based parser (libxml) rather than
  * stream-based SAX-type parser
@@ -821,9 +821,7 @@ xpath_table(PG_FUNCTION_ARGS)
 		{
 			/* not well-formed, so output all-NULL tuple */
 			ret_tuple = BuildTupleFromCStrings(attinmeta, values);
-			oldcontext = MemoryContextSwitchTo(per_query_ctx);
 			tuplestore_puttuple(tupstore, ret_tuple);
-			MemoryContextSwitchTo(oldcontext);
 			heap_freetuple(ret_tuple);
 		}
 		else
@@ -897,9 +895,7 @@ xpath_table(PG_FUNCTION_ARGS)
 				if (had_values)
 				{
 					ret_tuple = BuildTupleFromCStrings(attinmeta, values);
-					oldcontext = MemoryContextSwitchTo(per_query_ctx);
 					tuplestore_puttuple(tupstore, ret_tuple);
-					MemoryContextSwitchTo(oldcontext);
 					heap_freetuple(ret_tuple);
 				}
 
-- 
cgit v1.2.3