From dce43d22f052f7c9cbbf9535c9e50aaa7e51c1d9 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 12 Jul 2000 18:04:47 +0000
Subject: [PATCH] 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
---
src/backend/utils/cache/temprel.c | 7 +++----
src/makefiles/Makefile.aix | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/backend/utils/cache/temprel.c b/src/backend/utils/cache/temprel.c
index e336e019398..6ba2d176512 100644
--- 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 d614f1a0371..ba6d0540d39 100644
--- 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)
--
GitLab