diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2006-01-17 17:33:23 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2006-01-17 17:33:23 +0000 |
| commit | 7b3d9367b449f160fd4597094b0e18054d555b09 (patch) | |
| tree | f109232720b413474b59d94070d1f8c860be39df /src/backend/parser/parse_target.c | |
| parent | afe91cae6c45f5f06881651e6cea35972a0d4586 (diff) | |
| download | postgresql-7b3d9367b449f160fd4597094b0e18054d555b09.tar.gz postgresql-7b3d9367b449f160fd4597094b0e18054d555b09.zip | |
Repair problems with the result of lookup_rowtype_tupdesc() possibly being
discarded by cache flush while still in use. This is a minimal patch that
just copies the tupdesc anywhere it could be needed across a flush. Applied
to back branches only; Neil Conway is working on a better long-term solution
for HEAD.
Diffstat (limited to 'src/backend/parser/parse_target.c')
| -rw-r--r-- | src/backend/parser/parse_target.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c index 4290045baab..e32ad225514 100644 --- a/src/backend/parser/parse_target.c +++ b/src/backend/parser/parse_target.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_target.c,v 1.138.2.1 2005/11/22 18:23:14 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/parser/parse_target.c,v 1.138.2.2 2006/01/17 17:33:20 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -816,7 +816,8 @@ ExpandIndirectionStar(ParseState *pstate, A_Indirection *ind) ((Var *) expr)->vartype == RECORDOID) tupleDesc = expandRecordVariable(pstate, (Var *) expr, 0); else if (get_expr_result_type(expr, NULL, &tupleDesc) != TYPEFUNC_COMPOSITE) - tupleDesc = lookup_rowtype_tupdesc(exprType(expr), exprTypmod(expr)); + tupleDesc = CreateTupleDescCopy(lookup_rowtype_tupdesc(exprType(expr), + exprTypmod(expr))); Assert(tupleDesc); /* Generate a list of references to the individual fields */ @@ -993,7 +994,8 @@ expandRecordVariable(ParseState *pstate, Var *var, int levelsup) * appropriate error message while failing. */ if (get_expr_result_type(expr, NULL, &tupleDesc) != TYPEFUNC_COMPOSITE) - tupleDesc = lookup_rowtype_tupdesc(exprType(expr), exprTypmod(expr)); + tupleDesc = CreateTupleDescCopy(lookup_rowtype_tupdesc(exprType(expr), + exprTypmod(expr))); return tupleDesc; } |