Can you please apply the following patch to current CVS

bmomjian · bmomjian · commit dce43d22f052 · 2000-07-12T18:04:47.000Z
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
@@ -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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.26 2000/07/04 06:11:47 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.27 2000/07/12 18:04:45 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -107,6 +107,7 @@ remove_all_temp_relations(void)`
`107`	`107`
`108`	`108`	`next = lnext(l); /* do this first, l is deallocated */`
`109`	`109`
	`110`	`+ /* Indexes are dropped during heap drop */`
`110`	`111`	`if (temp_rel->relkind != RELKIND_INDEX)`
`111`	`112`	`{`
`112`	`113`	`char relname[NAMEDATALEN];`
`@@ -115,8 +116,6 @@ remove_all_temp_relations(void)`
`115`	`116`	`strcpy(relname, temp_rel->user_relname);`
`116`	`117`	`heap_drop_with_catalog(relname, allowSystemTableMods);`
`117`	`118`	`}`
`118`		`- else`
`119`		`- index_drop(temp_rel->relid);`
`120`	`119`
`121`	`120`	`l = next;`
`122`	`121`	`}`
`@@ -235,7 +234,7 @@ invalidate_temp_relations(void)`
`235`	`234`	`*`
`236`	`235`	`* We also reject an attempt to rename a normal table to a name in use`
`237`	`236`	`* as a temp table name. That would fail later on anyway when rename.c`
`238`		`- * looks for a rename conflict, but we can give a more specific error`
	`237`	`+ * looks for a rename conflict, but we can give a more specific error`
`239`	`238`	`* message for the problem here.`
`240`	`239`	`*`
`241`	`240`	`* It might seem that we need to check for attempts to rename the physical`