Can you please apply the following patch to current CVS

to make AIX'ers happy with the changes to the version.o ?

Together with the patch I sent Tom, AIX now regresses ok.

Thanx
Andreas

diff --git a/src/backend/utils/cache/temprel.c b/src/backend/utils/cache/temprel.c
index e336e0193986279de15c9b5b47c6c3228e84d197..6ba2d1765122d49e30308d7363f6e0c6edda5a28 100644 (file)
--- a/src/backend/utils/cache/temprel.c
+++ b/src/backend/utils/cache/temprel.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.26 2000/07/04 06:11:47 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.27 2000/07/12 18:04:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -107,6 +107,7 @@ remove_all_temp_relations(void)
 
        next = lnext(l);        /* do this first, l is deallocated */
 
+       /* Indexes are dropped during heap drop */
        if (temp_rel->relkind != RELKIND_INDEX)
        {
            char        relname[NAMEDATALEN];
@@ -115,8 +116,6 @@ remove_all_temp_relations(void)
            strcpy(relname, temp_rel->user_relname);
            heap_drop_with_catalog(relname, allowSystemTableMods);
        }
-       else
-           index_drop(temp_rel->relid);
 
        l = next;
    }
@@ -235,7 +234,7 @@ invalidate_temp_relations(void)
  *
  * We also reject an attempt to rename a normal table to a name in use
  * as a temp table name.  That would fail later on anyway when rename.c
- * looks for a rename conflict, but we can give a more specific error 
+ * looks for a rename conflict, but we can give a more specific error
  * message for the problem here.
  *
  * It might seem that we need to check for attempts to rename the physical

diff --git a/src/makefiles/Makefile.aix b/src/makefiles/Makefile.aix
index d614f1a0371916ac74ddf3bb41a7014f783085e0..ba6d0540d393571daf947f350f2391497907b5b9 100644 (file)
--- a/src/makefiles/Makefile.aix
+++ b/src/makefiles/Makefile.aix
@@ -15,7 +15,7 @@ MKLDEXPORT=$(SRCDIR)/backend/port/aix/mkldexport.sh
 $(POSTGRES_IMP):
    @echo Making $@
    $(MKLDEXPORT) postgres $(BINDIR) > $@
-   $(CC) -Wl,-bE:$(SRCDIR)/backend/$@ -o postgres $(OBJS) ../utils/version.o $(LDFLAGS)
+   $(CC) -Wl,-bE:$(SRCDIR)/backend/$@ -o postgres $(OBJS) $(LDFLAGS)
 
 %$(EXPSUFF):
    $(MKLDEXPORT) $*.o `pwd` > $*$(EXPSUFF)