Remove incorrect extra heap_close when deleting a builtin function.

tglsfdc · tglsfdc · commit cdc7170ebe45 · 2000-09-12T16:48:55.000Z
diff --git a/src/backend/commands/remove.c b/src/backend/commands/remove.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.51 2000/09/06 14:15:16 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.52 2000/09/12 16:48:55 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -356,15 +356,12 @@ RemoveFunction(char *functionName,		/* function name to be removed */
 							  0);
 
 	if (!HeapTupleIsValid(tup))
-	{
-		heap_close(relation, RowExclusiveLock);
 		func_error("RemoveFunction", functionName, nargs, argList, NULL);
-	}
 
 	if (((Form_pg_proc) GETSTRUCT(tup))->prolang == INTERNALlanguageId ||
 		((Form_pg_proc) GETSTRUCT(tup))->prolang == NEWINTERNALlanguageId)
 	{
-		heap_close(relation, RowExclusiveLock);
+		/* "Helpful" notice when removing a builtin function ... */
 		elog(NOTICE, "Removing built-in function \"%s\"", functionName);
 	}
 

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/commands/Attic/remove.c,v 1.51 2000/09/06 14:15:16 petere Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.52 2000/09/12 16:48:55 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -356,15 +356,12 @@ RemoveFunction(char functionName, / function name to be removed */`
`356`	`356`	`0);`
`357`	`357`
`358`	`358`	`if (!HeapTupleIsValid(tup))`
`359`		`- {`
`360`		`- heap_close(relation, RowExclusiveLock);`
`361`	`359`	`func_error("RemoveFunction", functionName, nargs, argList, NULL);`
`362`		`- }`
`363`	`360`
`364`	`361`	`if (((Form_pg_proc) GETSTRUCT(tup))->prolang == INTERNALlanguageId \|\|`
`365`	`362`	`((Form_pg_proc) GETSTRUCT(tup))->prolang == NEWINTERNALlanguageId)`
`366`	`363`	`{`
`367`		`- heap_close(relation, RowExclusiveLock);`
	`364`	`+ /* "Helpful" notice when removing a builtin function ... */`
`368`	`365`	`elog(NOTICE, "Removing built-in function \"%s\"", functionName);`
`369`	`366`	`}`
`370`	`367`