diff options
| -rw-r--r-- | src/pl/plpgsql/src/pl_exec.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c index 3a381e16b6f..3bd3bbd3dd8 100644 --- a/src/pl/plpgsql/src/pl_exec.c +++ b/src/pl/plpgsql/src/pl_exec.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.180.2.4 2007/02/08 18:37:43 tgl Exp $ + * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.180.2.5 2007/04/19 16:33:32 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -951,6 +951,25 @@ exec_stmt_block(PLpgSQL_execstate *estate, PLpgSQL_stmt_block *block) /* Run the block's statements */ rc = exec_stmts(estate, block->body); + /* + * If the block ended with RETURN, we may need to copy the return + * value out of the subtransaction eval_context. This is currently + * only needed for scalar result types --- rowtype values will + * always exist in the function's own memory context. + */ + if (rc == PLPGSQL_RC_RETURN && + !estate->retisset && + !estate->retisnull && + estate->rettupdesc == NULL) + { + int16 resTypLen; + bool resTypByVal; + + get_typlenbyval(estate->rettype, &resTypLen, &resTypByVal); + estate->retval = datumCopy(estate->retval, + resTypByVal, resTypLen); + } + /* Commit the inner transaction, return to outer xact context */ ReleaseCurrentSubTransaction(); MemoryContextSwitchTo(oldcontext); |