Fix problem with temp tables shown in regression test by Jan.

diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c
index 2aaaf69e83e9d67a4e9c98c9cea5e75d4fc91030..86834f5d883ef963a6521021782d85419698c2a6 100644 (file)
--- a/src/backend/storage/lmgr/lmgr.c
+++ b/src/backend/storage/lmgr/lmgr.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.35 1999/09/18 19:07:38 tgl Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.36 1999/11/17 23:51:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -118,7 +118,7 @@ RelationInitLockInfo(Relation relation)
        Assert(RelationIsValid(relation));
        Assert(OidIsValid(RelationGetRelid(relation)));
 
-       relname = (char *) RelationGetRelationName(relation);
+       relname = (char *) RelationGetPhysicalRelationName(relation);
 
        relation->rd_lockInfo.lockRelId.relId = RelationGetRelid(relation);
 

diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c
index e5f7beea339fcfe4d88932557c0d76e96307390e..26f45a1e9b2d0ede5eb7293b78eaf1dc2d524518 100644 (file)
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.28 1999/11/07 23:08:26 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.29 1999/11/17 23:51:21 momjian Exp $
  *
  * Note - this code is real crufty...
  *
@@ -561,7 +561,7 @@ RegisterInvalid(bool send)
 #ifdef INVALIDDEBUG
 #define RelationInvalidateHeapTuple_DEBUG1 \
 elog(DEBUG, "RelationInvalidateHeapTuple(%s, [%d,%d])", \
-        RelationGetRelationName(relation), \
+        RelationGetPhysicalRelationName(relation), \
         ItemPointerGetBlockNumber(&tuple->t_ctid), \
         ItemPointerGetOffsetNumber(&tuple->t_ctid))
 #else

diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index a0b971586027ab7ee0b17455858c9ba816ebaceb..18480b9fc3c3061f9160cdf20ed95d5f58d47ead 100644 (file)
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.77 1999/11/16 04:13:58 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.78 1999/11/17 23:51:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -133,7 +133,7 @@ typedef struct relnamecacheent
 do { \
        RelIdCacheEnt *idhentry; RelNameCacheEnt *namehentry; \
        char *relname; Oid reloid; bool found; \
-       relname = RelationGetRelationName(RELATION); \
+       relname = RelationGetPhysicalRelationName(RELATION); \
        namehentry = (RelNameCacheEnt*)hash_search(RelationNameCache, \
                                                                                           relname, \
                                                                                           HASH_ENTER, \
@@ -186,7 +186,7 @@ do { \
 do { \
        RelNameCacheEnt *namehentry; RelIdCacheEnt *idhentry; \
        char *relname; Oid reloid; bool found; \
-       relname = RelationGetRelationName(RELATION); \
+       relname = RelationGetPhysicalRelationName(RELATION); \
        namehentry = (RelNameCacheEnt*)hash_search(RelationNameCache, \
                                                                                           relname, \
                                                                                           HASH_REMOVE, \
@@ -1840,8 +1840,7 @@ RelCheckFetch(Relation relation)
 
        if (found < ncheck)
                elog(ERROR, "RelCheckFetch: %d record not found for rel %s",
-                        ncheck - found,
-                        RelationGetRelationName(relation));
+                        ncheck - found, RelationGetRelationName(relation));
 
        index_endscan(sd);
        pfree(sd);