postgrespro
diff --git a/‎src/backend/commands/command.c
Lines changed: 4 additions & 4 deletions b/‎src/backend/commands/command.c
Lines changed: 4 additions & 4 deletions
diff --git a/‎src/backend/commands/rename.c
Lines changed: 3 additions & 4 deletions b/‎src/backend/commands/rename.c
Lines changed: 3 additions & 4 deletions
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.59 1999/12/10 03:55:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.60 1999/12/14 03:35:20 tgl Exp $
  *
  * NOTES
  *	  The PortalExecutorHeapMemory crap needs to be eliminated
@@ -340,12 +340,11 @@ PerformAddAttribute(char *relationName,
 	{
 		if (inherits)
 		{
-			Oid			childrelid;
 			List	   *child,
 					   *children;
 
 			/* this routine is actually in the planner */
-			children = find_all_inheritors(lconsi(myrelid, NIL), NIL);
+			children = find_all_inheritors(myrelid);
 
 			/*
 			 * find_all_inheritors does the recursive search of the
@@ -354,7 +353,8 @@ PerformAddAttribute(char *relationName,
 			 */
 			foreach(child, children)
 			{
-				childrelid = lfirsti(child);
+				Oid		childrelid = lfirsti(child);
+
 				if (childrelid == myrelid)
 					continue;
 				rel = heap_open(childrelid, AccessExclusiveLock);
 
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.37 1999/11/25 00:15:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.38 1999/12/14 03:35:20 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -97,7 +97,7 @@ renameatt(char *relname,
 				   *children;
 
 		/* this routine is actually in the planner */
-		children = find_all_inheritors(lconsi(relid, NIL), NIL);
+		children = find_all_inheritors(relid);
 
 		/*
 		 * find_all_inheritors does the recursive search of the
@@ -106,10 +106,9 @@ renameatt(char *relname,
 		 */
 		foreach(child, children)
 		{
-			Oid			childrelid;
+			Oid			childrelid = lfirsti(child);
 			char		childname[NAMEDATALEN];
 
-			childrelid = lfirsti(child);
 			if (childrelid == relid)
 				continue;
 			reltup = SearchSysCacheTuple(RELOID,
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.59 1999/12/10 03:55:49 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.60 1999/12/14 03:35:20 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* The PortalExecutorHeapMemory crap needs to be eliminated`
`@@ -340,12 +340,11 @@ PerformAddAttribute(char *relationName,`
`340`	`340`	`{`
`341`	`341`	`if (inherits)`
`342`	`342`	`{`
`343`		`- Oid childrelid;`
`344`	`343`	`List *child,`
`345`	`344`	`*children;`
`346`	`345`
`347`	`346`	`/* this routine is actually in the planner */`
`348`		`- children = find_all_inheritors(lconsi(myrelid, NIL), NIL);`
	`347`	`+ children = find_all_inheritors(myrelid);`
`349`	`348`
`350`	`349`	`/*`
`351`	`350`	`* find_all_inheritors does the recursive search of the`
`@@ -354,7 +353,8 @@ PerformAddAttribute(char *relationName,`
`354`	`353`	`*/`
`355`	`354`	`foreach(child, children)`
`356`	`355`	`{`
`357`		`- childrelid = lfirsti(child);`
	`356`	`+ Oid childrelid = lfirsti(child);`
	`357`	`+`
`358`	`358`	`if (childrelid == myrelid)`
`359`	`359`	`continue;`
`360`	`360`	`rel = heap_open(childrelid, AccessExclusiveLock);`