diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-08-20 15:16:59 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-08-20 15:16:59 +0000 |
| commit | 31309423c9fa0a50afb138760def0897969f727f (patch) | |
| tree | cf013efbb1f81b61d391f62dcbfc445bfbfe16f2 /src/backend/commands/vacuum.c | |
| parent | 09e125084af207a76bd456d13ced9f7a15caeb83 (diff) | |
| download | postgresql-31309423c9fa0a50afb138760def0897969f727f.tar.gz | |
Another vacuum fix.
Diffstat (limited to 'src/backend/commands/vacuum.c')
| -rw-r--r-- | src/backend/commands/vacuum.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index e4d215d452..6448d2e830 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.74 1998/08/19 23:48:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.75 1998/08/20 15:16:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -188,7 +188,7 @@ vc_init() if ((fd = open("pg_vlock", O_CREAT | O_EXCL, 0600)) < 0) { - elog(ERROR, "Can't create lock file -- another vacuum cleaner running?\n\ + elog(ERROR, "Can't create lock file. Is another vacuum cleaner running?\n\ \tIf not, you may remove the pg_vlock file in the pgsql/data/base/your_db\n\ \tdirectory"); } @@ -2204,24 +2204,25 @@ static void vc_mkindesc(Relation onerel, int nindices, Relation *Irel, IndDesc **Idesc) { IndDesc *idcur; - HeapTuple tuple; + HeapTuple tuple, cachetuple; AttrNumber *attnumP; int natts; int i; Buffer buffer; - + *Idesc = (IndDesc *) palloc(nindices * sizeof(IndDesc)); for (i = 0, idcur = *Idesc; i < nindices; i++, idcur++) { - tuple = SearchSysCacheTuple(INDEXRELID, - ObjectIdGetDatum(RelationGetRelid(Irel[i])), - 0, 0, 0); + cachetuple = SearchSysCacheTupleCopy(INDEXRELID, + ObjectIdGetDatum(RelationGetRelid(Irel[i])), + 0, 0, 0); Assert(tuple); /* get the buffer cache tuple */ - tuple = heap_fetch(onerel, SnapshotNow, &tuple->t_ctid, &buffer); + tuple = heap_fetch(onerel, SnapshotNow, &cachetuple->t_ctid, &buffer); Assert(tuple); + pfree(cachetuple); idcur->tform = (IndexTupleForm) GETSTRUCT(tuple); for (attnumP = &(idcur->tform->indkey[0]), natts = 0; |