1 files changed, 15 insertions, 15 deletions

diff --git a/src/backend/tcop/variable.c b/src/backend/tcop/variable.c
index c6fe6244933..82bd737c41f 100644
--- a/src/backend/tcop/variable.c
+++ b/src/backend/tcop/variable.c
@@ -2,7 +2,7 @@
  * Routines for handling of 'SET var TO',
  *  'SHOW var' and 'RESET var' statements.
  *
- * $Id: variable.c,v 1.25 1998/01/05 03:33:50 momjian Exp $
+ * $Id: variable.c,v 1.26 1998/01/05 16:39:35 momjian Exp $
  *
  */
 
@@ -53,7 +53,7 @@ get_token(char **tok, char **val, const char *str)
 	while (isspace(*str))
 		str++;
 	if (*str == ',' || *str == '=')
-		elog(ABORT, "Syntax error near (%s): empty setting", str);
+		elog(ERROR, "Syntax error near (%s): empty setting", str);
 
 	/* end of string? then return NULL */
 	if (!(*str))
@@ -94,7 +94,7 @@ get_token(char **tok, char **val, const char *str)
 	}
 	else if ((val == NULL) || (*str != '='))
 	{
-		elog(ABORT, "Syntax error near (%s)", str);
+		elog(ERROR, "Syntax error near (%s)", str);
 	};
 
 	str++;						/* '=': get value */
@@ -105,7 +105,7 @@ get_token(char **tok, char **val, const char *str)
 		str++;
 
 	if (*str == ',' || !(*str))
-		elog(ABORT, "Syntax error near (=%s)", str);
+		elog(ERROR, "Syntax error near (=%s)", str);
 
 	start = str;
 
@@ -131,7 +131,7 @@ get_token(char **tok, char **val, const char *str)
 	if (*str == ',')
 		return (++str);
 
-	elog(ABORT, "Syntax error near (%s)", str);
+	elog(ERROR, "Syntax error near (%s)", str);
 
 	return str;
 }
@@ -172,10 +172,10 @@ parse_geqo(const char *value)
 
 	rest = get_token(&tok, &val, value);
 	if (tok == NULL)
-		elog(ABORT, "Value undefined");
+		elog(ERROR, "Value undefined");
 
 	if ((rest) && (*rest != '\0'))
-		elog(ABORT, "Unable to parse '%s'", value);
+		elog(ERROR, "Unable to parse '%s'", value);
 
 	if (strcasecmp(tok, "on") == 0)
 	{
@@ -185,7 +185,7 @@ parse_geqo(const char *value)
 		{
 			geqo_rels = pg_atoi(val, sizeof(int32), '\0');
 			if (geqo_rels <= 1)
-				elog(ABORT, "Bad value for # of relations (%s)", val);
+				elog(ERROR, "Bad value for # of relations (%s)", val);
 			PFREE(val);
 		}
 		_use_geqo_ = true;
@@ -194,11 +194,11 @@ parse_geqo(const char *value)
 	else if (strcasecmp(tok, "off") == 0)
 	{
 		if ((val != NULL) && (*val != '\0'))
-			elog(ABORT, "%s does not allow a parameter", tok);
+			elog(ERROR, "%s does not allow a parameter", tok);
 		_use_geqo_ = false;
 	}
 	else
-		elog(ABORT, "Bad value for GEQO (%s)", value);
+		elog(ERROR, "Bad value for GEQO (%s)", value);
 
 	PFREE(tok);
 	return TRUE;
@@ -242,7 +242,7 @@ parse_r_plans(const char *value)
 	else if (strcasecmp(value, "off") == 0)
 		_use_right_sided_plans_ = false;
 	else
-		elog(ABORT, "Bad value for Right-sided Plans (%s)", value);
+		elog(ERROR, "Bad value for Right-sided Plans (%s)", value);
 
 	return TRUE;
 }
@@ -392,7 +392,7 @@ parse_date(const char *value)
 		}
 		else
 		{
-			elog(ABORT, "Bad value for date style (%s)", tok);
+			elog(ERROR, "Bad value for date style (%s)", tok);
 		}
 		PFREE(tok);
 	}
@@ -490,7 +490,7 @@ parse_timezone(const char *value)
 		strcpy(tzbuf, "TZ=");
 		strcat(tzbuf, tok);
 		if (putenv(tzbuf) != 0)
-			elog(ABORT, "Unable to set TZ environment variable to %s", tok);
+			elog(ERROR, "Unable to set TZ environment variable to %s", tok);
 
 		tzset();
 		PFREE(tok);
@@ -528,13 +528,13 @@ reset_timezone()
 		strcpy(tzbuf, "TZ=");
 		strcat(tzbuf, TZvalue);
 		if (putenv(tzbuf) != 0)
-			elog(ABORT, "Unable to set TZ environment variable to %s", TZvalue);
+			elog(ERROR, "Unable to set TZ environment variable to %s", TZvalue);
 	}
 	else
 	{
 		strcpy(tzbuf, "=");
 		if (putenv(tzbuf) != 0)
-			elog(ABORT, "Unable to clear TZ environment variable", NULL);
+			elog(ERROR, "Unable to clear TZ environment variable", NULL);
 	}
 	tzset();