Change some ABORTS to ERROR. Add line number when COPY Failure.

1 files changed, 8 insertions, 8 deletions

diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c
index 1044ce9a7b7..77d81ff1989 100644
--- a/src/backend/commands/proclang.c
+++ b/src/backend/commands/proclang.c
@@ -64,7 +64,7 @@ CreateProceduralLanguage(CreatePLangStmt * stmt)
 	 */
 	if (!superuser())
 	{
-		elog(ABORT, "Only users with Postgres superuser privilege are "
+		elog(ERROR, "Only users with Postgres superuser privilege are "
 			 "permitted to create procedural languages");
 	}
 
@@ -80,7 +80,7 @@ CreateProceduralLanguage(CreatePLangStmt * stmt)
 								  0, 0, 0);
 	if (HeapTupleIsValid(langTup))
 	{
-		elog(ABORT, "Language %s already exists", languageName);
+		elog(ERROR, "Language %s already exists", languageName);
 	}
 
 	/* ----------------
@@ -96,12 +96,12 @@ CreateProceduralLanguage(CreatePLangStmt * stmt)
 								  0);
 	if (!HeapTupleIsValid(procTup))
 	{
-		elog(ABORT, "PL handler function %s() doesn't exist",
+		elog(ERROR, "PL handler function %s() doesn't exist",
 			 stmt->plhandler);
 	}
 	if (((Form_pg_proc) GETSTRUCT(procTup))->prorettype != InvalidOid)
 	{
-		elog(ABORT, "PL handler function %s() isn't of return type Opaque",
+		elog(ERROR, "PL handler function %s() isn't of return type Opaque",
 			 stmt->plhandler);
 	}
 
@@ -155,7 +155,7 @@ DropProceduralLanguage(DropPLangStmt * stmt)
 	 */
 	if (!superuser())
 	{
-		elog(ABORT, "Only users with Postgres superuser privilege are "
+		elog(ERROR, "Only users with Postgres superuser privilege are "
 			 "permitted to drop procedural languages");
 	}
 
@@ -171,12 +171,12 @@ DropProceduralLanguage(DropPLangStmt * stmt)
 								  0, 0, 0);
 	if (!HeapTupleIsValid(langTup))
 	{
-		elog(ABORT, "Language %s doesn't exist", languageName);
+		elog(ERROR, "Language %s doesn't exist", languageName);
 	}
 
 	if (!((Form_pg_language) GETSTRUCT(langTup))->lanispl)
 	{
-		elog(ABORT, "Language %s isn't a created procedural language",
+		elog(ERROR, "Language %s isn't a created procedural language",
 			 languageName);
 	}
 
@@ -195,7 +195,7 @@ DropProceduralLanguage(DropPLangStmt * stmt)
 
 	if (!HeapTupleIsValid(tup))
 	{
-		elog(ABORT, "Language with name '%s' not found", languageName);
+		elog(ERROR, "Language with name '%s' not found", languageName);
 	}
 
 	heap_delete(rdesc, &(tup->t_ctid));