Goodbye ABORT. Hello ERROR for all errors.

2 files changed, 19 insertions, 19 deletions

diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index d92893bfa2..dae7f92557 100644
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.15 1998/01/05 03:34:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.16 1998/01/07 21:06:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -75,7 +75,7 @@ fmgr_dynamic(Oid procedureId, int *pronargs)
 										 0, 0, 0);
 	if (!HeapTupleIsValid(procedureTuple))
 	{
-		elog(ABORT, "fmgr: Cache lookup failed for procedure %d\n",
+		elog(ERROR, "fmgr: Cache lookup failed for procedure %d\n",
 			 procedureId);
 		return ((func_ptr) NULL);
 	}
@@ -95,7 +95,7 @@ fmgr_dynamic(Oid procedureId, int *pronargs)
 	rdesc = heap_openr(ProcedureRelationName);
 	if (!RelationIsValid(rdesc))
 	{
-		elog(ABORT, "fmgr: Could not open relation %s",
+		elog(ERROR, "fmgr: Could not open relation %s",
 			 ProcedureRelationName);
 		return ((func_ptr) NULL);
 	}
@@ -105,7 +105,7 @@ fmgr_dynamic(Oid procedureId, int *pronargs)
 	if (!PointerIsValid(probinattr) /* || isnull */ )
 	{
 		heap_close(rdesc);
-		elog(ABORT, "fmgr: Could not extract probin for %d from %s",
+		elog(ERROR, "fmgr: Could not extract probin for %d from %s",
 			 procedureId, ProcedureRelationName);
 		return ((func_ptr) NULL);
 	}
@@ -150,7 +150,7 @@ handle_load(char *filename, char *funcname)
 		{
 			if (stat(filename, &stat_buf) == -1)
 			{
-				elog(ABORT, "stat failed on file %s", filename);
+				elog(ERROR, "stat failed on file %s", filename);
 			}
 
 			for (file_scanner = file_list;
@@ -211,7 +211,7 @@ handle_load(char *filename, char *funcname)
 			}
 
 			free((char *) file_scanner);
-			elog(ABORT, "Load of file %s failed: %s", filename, load_error);
+			elog(ERROR, "Load of file %s failed: %s", filename, load_error);
 		}
 
 		/*
@@ -227,7 +227,7 @@ handle_load(char *filename, char *funcname)
 
 	if (retval == (func_ptr) NULL)
 	{
-		elog(ABORT, "Can't find function %s in file %s", funcname, filename);
+		elog(ERROR, "Can't find function %s in file %s", funcname, filename);
 	}
 
 	return (retval);
@@ -255,7 +255,7 @@ load_file(char *filename)
 
 	if (stat(filename, &stat_buf) == -1)
 	{
-		elog(ABORT, "stat failed on file %s", filename);
+		elog(ERROR, "stat failed on file %s", filename);
 	}
 
 	if (file_list != (DynamicFileList *) NULL
diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c
index 72fe136c8b..7a3798ebe1 100644
--- a/src/backend/utils/fmgr/fmgr.c
+++ b/src/backend/utils/fmgr/fmgr.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.8 1998/01/05 03:34:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.9 1998/01/07 21:06:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -51,7 +51,7 @@ fmgr_pl(Oid func_id,
 										 0, 0, 0);
 	if (!HeapTupleIsValid(procedureTuple))
 	{
-		elog(ABORT, "fmgr_pl(): Cache lookup of procedure %ld failed.",
+		elog(ERROR, "fmgr_pl(): Cache lookup of procedure %ld failed.",
 			 ObjectIdGetDatum(func_id));
 	}
 	procedureStruct = (Form_pg_proc) GETSTRUCT(procedureTuple);
@@ -62,7 +62,7 @@ fmgr_pl(Oid func_id,
 										0, 0, 0);
 	if (!HeapTupleIsValid(languageTuple))
 	{
-		elog(ABORT, "fmgr_pl(): Cache lookup of language %ld for procedure %ld failed.",
+		elog(ERROR, "fmgr_pl(): Cache lookup of language %ld for procedure %ld failed.",
 			 ObjectIdGetDatum(procedureStruct->prolang),
 			 ObjectIdGetDatum(func_id));
 	}
@@ -72,7 +72,7 @@ fmgr_pl(Oid func_id,
 	fmgr_info(languageStruct->lanplcallfoid, &plcall_fn, &plcall_nargs);
 	if (plcall_fn == NULL)
 	{
-		elog(ABORT, "fmgr_pl(): failed to load PL handler for procedure %ld.",
+		elog(ERROR, "fmgr_pl(): failed to load PL handler for procedure %ld.",
 			 ObjectIdGetDatum(func_id));
 	}
 
@@ -163,7 +163,7 @@ fmgr_c(func_ptr user_fn,
 									  values->data[8]);
 			break;
 		default:
-			elog(ABORT, "fmgr_c: function %d: too many arguments (%d > %d)",
+			elog(ERROR, "fmgr_c: function %d: too many arguments (%d > %d)",
 				 func_id, n_arguments, MAXFMGRARGS);
 			break;
 	}
@@ -188,7 +188,7 @@ fmgr_info(Oid procedureId, func_ptr * function, int *nargs)
 											 0, 0, 0);
 		if (!HeapTupleIsValid(procedureTuple))
 		{
-			elog(ABORT, "fmgr_info: function %d: cache lookup failed\n",
+			elog(ERROR, "fmgr_info: function %d: cache lookup failed\n",
 				 procedureId);
 		}
 		procedureStruct = (FormData_pg_proc *)
@@ -205,7 +205,7 @@ fmgr_info(Oid procedureId, func_ptr * function, int *nargs)
 			case INTERNALlanguageId:
 				user_fn = fmgr_lookupByName(procedureStruct->proname.data);
 				if (!user_fn)
-					elog(ABORT, "fmgr_info: function %s: not in internal table",
+					elog(ERROR, "fmgr_info: function %s: not in internal table",
 						 procedureStruct->proname.data);
 				break;
 			case ClanguageId:
@@ -228,7 +228,7 @@ fmgr_info(Oid procedureId, func_ptr * function, int *nargs)
 													0, 0, 0);
 				if (!HeapTupleIsValid(languageTuple))
 				{
-					elog(ABORT, "fmgr_info: %s %ld",
+					elog(ERROR, "fmgr_info: %s %ld",
 						 "Cache lookup for language %d failed",
 						 ObjectIdGetDatum(procedureStruct->prolang));
 				}
@@ -241,7 +241,7 @@ fmgr_info(Oid procedureId, func_ptr * function, int *nargs)
 				}
 				else
 				{
-					elog(ABORT, "fmgr_info: function %d: unknown language %d",
+					elog(ERROR, "fmgr_info: function %d: unknown language %d",
 						 procedureId, language);
 				}
 				break;
@@ -282,7 +282,7 @@ fmgr(Oid procedureId,...)
 
 	if (pronargs > MAXFMGRARGS)
 	{
-		elog(ABORT, "fmgr: function %d: too many arguments (%d > %d)",
+		elog(ERROR, "fmgr: function %d: too many arguments (%d > %d)",
 			 procedureId, pronargs, MAXFMGRARGS);
 	}
 	for (i = 0; i < pronargs; ++i)
@@ -317,7 +317,7 @@ fmgr_ptr(func_ptr user_fn, Oid func_id,...)
 	n_arguments = va_arg(pvar, int);
 	if (n_arguments > MAXFMGRARGS)
 	{
-		elog(ABORT, "fmgr_ptr: function %d: too many arguments (%d > %d)",
+		elog(ERROR, "fmgr_ptr: function %d: too many arguments (%d > %d)",
 			 func_id, n_arguments, MAXFMGRARGS);
 	}
 	for (i = 0; i < n_arguments; ++i)