Goodbye ABORT. Hello ERROR for all errors.

29 files changed, 147 insertions, 147 deletions

diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 48702bb8e1e..76c2b1d1dba 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.29 1998/01/05 03:28:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.30 1998/01/07 21:00:40 momjian Exp $
  *
  * NOTES
  *	  The old interface functions have been converted to macros
@@ -93,7 +93,7 @@ ComputeDataSize(TupleDesc tupleDesc,
 				break;
 			default:
 				if (att[i]->attlen < sizeof(int32))
-					elog(ABORT, "ComputeDataSize: attribute %d has len %d",
+					elog(ERROR, "ComputeDataSize: attribute %d has len %d",
 						 i, att[i]->attlen);
 				if (att[i]->attalign == 'd')
 					data_length = DOUBLEALIGN(data_length) + att[i]->attlen;
@@ -194,7 +194,7 @@ DataFill(char *data,
 				break;
 			default:
 				if (att[i]->attlen < sizeof(int32))
-					elog(ABORT, "DataFill: attribute %d has len %d",
+					elog(ERROR, "DataFill: attribute %d has len %d",
 						 i, att[i]->attlen);
 				if (att[i]->attalign == 'd')
 				{
@@ -249,10 +249,10 @@ heap_attisnull(HeapTuple tup, int attnum)
 				break;
 
 			case 0:
-				elog(ABORT, "heap_attisnull: zero attnum disallowed");
+				elog(ERROR, "heap_attisnull: zero attnum disallowed");
 
 			default:
-				elog(ABORT, "heap_attisnull: undefined negative attnum");
+				elog(ERROR, "heap_attisnull: undefined negative attnum");
 		}
 
 	return (0);
@@ -290,7 +290,7 @@ heap_sysattrlen(AttrNumber attno)
 			return sizeof f->t_cmax;
 
 		default:
-			elog(ABORT, "sysattrlen: System attribute number %d unknown.", attno);
+			elog(ERROR, "sysattrlen: System attribute number %d unknown.", attno);
 			return 0;
 	}
 }
@@ -328,7 +328,7 @@ heap_sysattrbyval(AttrNumber attno)
 			break;
 		default:
 			byval = true;
-			elog(ABORT, "sysattrbyval: System attribute number %d unknown.",
+			elog(ERROR, "sysattrbyval: System attribute number %d unknown.",
 				 attno);
 			break;
 	}
@@ -358,7 +358,7 @@ heap_getsysattr(HeapTuple tup, Buffer b, int attnum)
 		case MaxCommandIdAttributeNumber:
 			return ((Datum) (long) tup->t_cmax);
 		default:
-			elog(ABORT, "heap_getsysattr: undefined attnum %d", attnum);
+			elog(ERROR, "heap_getsysattr: undefined attnum %d", attnum);
 	}
 	return ((Datum) NULL);
 }
@@ -538,7 +538,7 @@ fastgetattr(HeapTuple tup,
 				default:
 					if (att[j]->attlen < sizeof(int32))
 					{
-						elog(ABORT,
+						elog(ERROR,
 							 "fastgetattr: attribute %d has len %d",
 							 j, att[j]->attlen);
 					}
@@ -598,7 +598,7 @@ fastgetattr(HeapTuple tup,
 					break;
 				default:
 					if (att[i]->attlen < sizeof(int32))
-						elog(ABORT,
+						elog(ERROR,
 							 "fastgetattr2: attribute %d has len %d",
 							 i, att[i]->attlen);
 					if (att[i]->attalign == 'd')
@@ -657,7 +657,7 @@ fastgetattr(HeapTuple tup,
 				break;
 			default:
 				if (att[attnum]->attlen < sizeof(int32))
-					elog(ABORT, "fastgetattr3: attribute %d has len %d",
+					elog(ERROR, "fastgetattr3: attribute %d has len %d",
 						 attnum, att[attnum]->attlen);
 				if (att[attnum]->attalign == 'd')
 					off = DOUBLEALIGN(off);
@@ -686,7 +686,7 @@ heap_copytuple(HeapTuple tuple)
 	/* XXX For now, just prevent an undetectable executor related error */
 	if (tuple->t_len > MAXTUPLEN)
 	{
-		elog(ABORT, "palloctup: cannot handle length %d tuples",
+		elog(ERROR, "palloctup: cannot handle length %d tuples",
 			 tuple->t_len);
 	}
 
@@ -773,7 +773,7 @@ heap_formtuple(TupleDesc tupleDescriptor,
 	}
 
 	if (numberOfAttributes > MaxHeapAttributeNumber)
-		elog(ABORT, "heap_formtuple: numberOfAttributes of %d > %d",
+		elog(ERROR, "heap_formtuple: numberOfAttributes of %d > %d",
 			 numberOfAttributes, MaxHeapAttributeNumber);
 
 	if (hasnull)
@@ -883,7 +883,7 @@ heap_modifytuple(HeapTuple tuple,
 		}
 		else if (repl[attoff] != 'r')
 		{
-			elog(ABORT, "heap_modifytuple: repl is \\%3d", repl[attoff]);
+			elog(ERROR, "heap_modifytuple: repl is \\%3d", repl[attoff]);
 
 		}
 		else
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index baa295b91ba..4941a60214d 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.21 1998/01/05 03:28:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.22 1998/01/07 21:00:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -56,7 +56,7 @@ index_formtuple(TupleDesc tupleDescriptor,
 	int			numberOfAttributes = tupleDescriptor->natts;
 
 	if (numberOfAttributes > MaxIndexAttributeNumber)
-		elog(ABORT, "index_formtuple: numberOfAttributes of %d > %d",
+		elog(ERROR, "index_formtuple: numberOfAttributes of %d > %d",
 			 numberOfAttributes, MaxIndexAttributeNumber);
 
 
@@ -103,7 +103,7 @@ index_formtuple(TupleDesc tupleDescriptor,
 	 */
 
 	if (size & 0xE000)
-		elog(ABORT, "index_formtuple: data takes %d bytes: too big", size);
+		elog(ERROR, "index_formtuple: data takes %d bytes: too big", size);
 
 
 	infomask |= size;
@@ -314,7 +314,7 @@ fastgetiattr(IndexTuple tup,
 						off = (att[j]->attalign == 'd') ?
 							DOUBLEALIGN(off) : LONGALIGN(off);
 					else
-						elog(ABORT, "fastgetiattr: attribute %d has len %d",
+						elog(ERROR, "fastgetiattr: attribute %d has len %d",
 							 j, att[j]->attlen);
 					break;
 
@@ -382,7 +382,7 @@ fastgetiattr(IndexTuple tup,
 							DOUBLEALIGN(off) + att[i]->attlen :
 							LONGALIGN(off) + att[i]->attlen;
 					else
-						elog(ABORT, "fastgetiattr2: attribute %d has len %d",
+						elog(ERROR, "fastgetiattr2: attribute %d has len %d",
 							 i, att[i]->attlen);
 
 					break;
@@ -409,7 +409,7 @@ fastgetiattr(IndexTuple tup,
 				break;
 			default:
 				if (att[attnum]->attlen < sizeof(int32))
-					elog(ABORT, "fastgetattr3: attribute %d has len %d",
+					elog(ERROR, "fastgetattr3: attribute %d has len %d",
 						 attnum, att[attnum]->attlen);
 				if (att[attnum]->attalign == 'd')
 					off = DOUBLEALIGN(off);
diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c
index 23fa7204eff..2a93e221589 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.21 1998/01/05 03:29:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.22 1998/01/07 21:00:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -45,7 +45,7 @@ typtoout(Oid type)
 		return ((Oid)
 				((TypeTupleForm) GETSTRUCT(typeTuple))->typoutput);
 
-	elog(ABORT, "typtoout: Cache lookup of type %d failed", type);
+	elog(ERROR, "typtoout: Cache lookup of type %d failed", type);
 	return (InvalidOid);
 }
 
@@ -62,7 +62,7 @@ gettypelem(Oid type)
 		return ((Oid)
 				((TypeTupleForm) GETSTRUCT(typeTuple))->typelem);
 
-	elog(ABORT, "typtoout: Cache lookup of type %d failed", type);
+	elog(ERROR, "typtoout: Cache lookup of type %d failed", type);
 	return (InvalidOid);
 }
 
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index 9c04bcc98c8..9324a95c768 100644
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.30 1998/01/05 03:29:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.31 1998/01/07 21:00:45 momjian Exp $
  *
  * NOTES
  *	  some of the executor utility code such as "ExecTypeFromTL" should be
@@ -321,7 +321,7 @@ TupleDescInitEntry(TupleDesc desc,
 	 *	RelationNameCreateHeapRelation() calls BuildDesc() which
 	 *	calls this routine and since EMP does not exist yet, the
 	 *	system cache lookup below fails.  That's fine, but rather
-	 *	then doing a elog(ABORT) we just leave that information
+	 *	then doing a elog(ERROR) we just leave that information
 	 *	uninitialized, return false, then fix things up later.
 	 *	-cim 6/14/90
 	 * ----------------
@@ -508,7 +508,7 @@ BuildDescForRelation(List *schema, char *relname)
 				TupleDescMakeSelfReference(desc, attnum, relname);
 			}
 			else
-				elog(ABORT, "DefineRelation: no such type %s",
+				elog(ERROR, "DefineRelation: no such type %s",
 					 typename);
 		}
 
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index db4cb4358cc..b247a93ed39 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -130,7 +130,7 @@ gistbuild(Relation heap,
 	 */
 
 	if (oldPred == NULL && (nb = RelationGetNumberOfBlocks(index)) != 0)
-		elog(ABORT, "%.16s already contains data", &(index->rd_rel->relname.data[0]));
+		elog(ERROR, "%.16s already contains data", &(index->rd_rel->relname.data[0]));
 
 	/* initialize the root page (if this is a new index) */
 	if (oldPred == NULL)
@@ -1182,7 +1182,7 @@ initGISTstate(GISTSTATE *giststate, Relation index)
 							   0, 0, 0);
 	itupform = (IndexTupleForm) GETSTRUCT(htup);
 	if (!HeapTupleIsValid(htup))
-		elog(ABORT, "initGISTstate: index %d not found", index->rd_id);
+		elog(ERROR, "initGISTstate: index %d not found", index->rd_id);
 	giststate->haskeytype = itupform->indhaskeytype;
 	if (giststate->haskeytype)
 	{
@@ -1193,7 +1193,7 @@ initGISTstate(GISTSTATE *giststate, Relation index)
 								   0, 0);
 		if (!HeapTupleIsValid(htup))
 		{
-			elog(ABORT, "initGISTstate: no attribute tuple %d %d",
+			elog(ERROR, "initGISTstate: no attribute tuple %d %d",
 				 itupform->indexrelid, FirstOffsetNumber);
 			return;
 		}
diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
index 11335dc2180..e5fa6b44a2d 100644
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -83,7 +83,7 @@ gistrescan(IndexScanDesc s, bool fromEnd, ScanKey key)
 
 	if (!IndexScanIsValid(s))
 	{
-		elog(ABORT, "gistrescan: invalid scan.");
+		elog(ERROR, "gistrescan: invalid scan.");
 		return;
 	}
 
@@ -281,7 +281,7 @@ gistdropscan(IndexScanDesc s)
 	}
 
 	if (l == (GISTScanList) NULL)
-		elog(ABORT, "GiST scan list corrupted -- cannot find 0x%lx", s);
+		elog(ERROR, "GiST scan list corrupted -- cannot find 0x%lx", s);
 
 	if (prev == (GISTScanList) NULL)
 		GISTScans = l->gsl_next;
@@ -397,7 +397,7 @@ adjustiptr(IndexScanDesc s,
 					break;
 
 				default:
-					elog(ABORT, "Bad operation in GiST scan adjust: %d", op);
+					elog(ERROR, "Bad operation in GiST scan adjust: %d", op);
 			}
 		}
 	}
diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c
index 87d7fca798f..c72a5e6c1f8 100644
--- a/src/backend/access/hash/hashinsert.c
+++ b/src/backend/access/hash/hashinsert.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.11 1998/01/05 03:29:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.12 1998/01/07 21:00:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -49,7 +49,7 @@ _hash_doinsert(Relation rel, HashItem hitem)
 	/* we need a scan key to do our search, so build one */
 	itup = &(hitem->hash_itup);
 	if ((natts = rel->rd_rel->relnatts) != 1)
-		elog(ABORT, "Hash indices valid for only one index key.");
+		elog(ERROR, "Hash indices valid for only one index key.");
 	itup_scankey = _hash_mkscankey(rel, itup, metap);
 
 	/*
@@ -167,7 +167,7 @@ _hash_insertonpg(Relation rel,
 			if (PageGetFreeSpace(page) < itemsz)
 			{
 				/* it doesn't fit on an empty page -- give up */
-				elog(ABORT, "hash item too large");
+				elog(ERROR, "hash item too large");
 			}
 		}
 		_hash_checkpage(page, LH_OVERFLOW_PAGE);
diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c
index a86a72f974b..363d79a7462 100644
--- a/src/backend/access/hash/hashovfl.c
+++ b/src/backend/access/hash/hashovfl.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.14 1998/01/05 03:29:20 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.15 1998/01/07 21:01:00 momjian Exp $
  *
  * NOTES
  *	  Overflow pages look like ordinary relation pages.
@@ -65,7 +65,7 @@ _hash_addovflpage(Relation rel, Buffer *metabufp, Buffer buf)
 	oaddr = _hash_getovfladdr(rel, metabufp);
 	if (oaddr == InvalidOvflAddress)
 	{
-		elog(ABORT, "_hash_addovflpage: problem with _hash_getovfladdr.");
+		elog(ERROR, "_hash_addovflpage: problem with _hash_getovfladdr.");
 	}
 	ovflblkno = OADDR_TO_BLKNO(OADDR_OF(SPLITNUM(oaddr), OPAGENUM(oaddr)));
 	Assert(BlockNumberIsValid(ovflblkno));
@@ -172,7 +172,7 @@ _hash_getovfladdr(Relation rel, Buffer *metabufp)
 	{
 		if (++splitnum >= NCACHED)
 		{
-			elog(ABORT, OVMSG);
+			elog(ERROR, OVMSG);
 		}
 		metap->OVFL_POINT = splitnum;
 		metap->SPARES[splitnum] = metap->SPARES[splitnum - 1];
@@ -190,7 +190,7 @@ _hash_getovfladdr(Relation rel, Buffer *metabufp)
 		free_page++;
 		if (free_page >= NCACHED)
 		{
-			elog(ABORT, OVMSG);
+			elog(ERROR, OVMSG);
 		}
 
 		/*
@@ -206,7 +206,7 @@ _hash_getovfladdr(Relation rel, Buffer *metabufp)
 		if (_hash_initbitmap(rel, metap, OADDR_OF(splitnum, offset),
 							 1, free_page))
 		{
-			elog(ABORT, "overflow_page: problem with _hash_initbitmap.");
+			elog(ERROR, "overflow_page: problem with _hash_initbitmap.");
 		}
 		metap->SPARES[splitnum]++;
 		offset++;
@@ -214,7 +214,7 @@ _hash_getovfladdr(Relation rel, Buffer *metabufp)
 		{
 			if (++splitnum >= NCACHED)
 			{
-				elog(ABORT, OVMSG);
+				elog(ERROR, OVMSG);
 			}
 			metap->OVFL_POINT = splitnum;
 			metap->SPARES[splitnum] = metap->SPARES[splitnum - 1];
@@ -262,7 +262,7 @@ found:
 	offset = (i ? bit - metap->SPARES[i - 1] : bit);
 	if (offset >= SPLITMASK)
 	{
-		elog(ABORT, OVMSG);
+		elog(ERROR, OVMSG);
 	}
 
 	/* initialize this page */
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
index f819ad82dec..8773e46c4bf 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.14 1998/01/05 03:29:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.15 1998/01/07 21:01:08 momjian Exp $
  *
  * NOTES
  *	  Postgres hash pages look like ordinary relation pages.  The opaque
@@ -85,7 +85,7 @@ _hash_metapinit(Relation rel)
 
 	if ((nblocks = RelationGetNumberOfBlocks(rel)) != 0)
 	{
-		elog(ABORT, "Cannot initialize non-empty hash table %s",
+		elog(ERROR, "Cannot initialize non-empty hash table %s",
 			 RelationGetRelationName(rel));
 	}
 
@@ -146,7 +146,7 @@ _hash_metapinit(Relation rel)
 	 * created the first two buckets above.
 	 */
 	if (_hash_initbitmap(rel, metap, OADDR_OF(lg2nelem, 1), lg2nelem + 1, 0))
-		elog(ABORT, "Problem with _hash_initbitmap.");
+		elog(ERROR, "Problem with _hash_initbitmap.");
 
 	/* all done */
 	_hash_wrtnorelbuf(rel, metabuf);
@@ -192,7 +192,7 @@ _hash_getbuf(Relation rel, BlockNumber blkno, int access)
 
 	if (blkno == P_NEW)
 	{
-		elog(ABORT, "_hash_getbuf: internal error: hash AM does not use P_NEW");
+		elog(ERROR, "_hash_getbuf: internal error: hash AM does not use P_NEW");
 	}
 	switch (access)
 	{
@@ -201,7 +201,7 @@ _hash_getbuf(Relation rel, BlockNumber blkno, int access)
 			_hash_setpagelock(rel, blkno, access);
 			break;
 		default:
-			elog(ABORT, "_hash_getbuf: invalid access (%d) on new blk: %s",
+			elog(ERROR, "_hash_getbuf: invalid access (%d) on new blk: %s",
 				 access, RelationGetRelationName(rel));
 			break;
 	}
@@ -228,7 +228,7 @@ _hash_relbuf(Relation rel, Buffer buf, int access)
 			_hash_unsetpagelock(rel, blkno, access);
 			break;
 		default:
-			elog(ABORT, "_hash_relbuf: invalid access (%d) on blk %x: %s",
+			elog(ERROR, "_hash_relbuf: invalid access (%d) on blk %x: %s",
 				 access, blkno, RelationGetRelationName(rel));
 	}
 
@@ -287,7 +287,7 @@ _hash_chgbufaccess(Relation rel,
 			_hash_relbuf(rel, *bufp, from_access);
 			break;
 		default:
-			elog(ABORT, "_hash_chgbufaccess: invalid access (%d) on blk %x: %s",
+			elog(ERROR, "_hash_chgbufaccess: invalid access (%d) on blk %x: %s",
 				 from_access, blkno, RelationGetRelationName(rel));
 			break;
 	}
@@ -335,7 +335,7 @@ _hash_setpagelock(Relation rel,
 				RelationSetSingleRLockPage(rel, &iptr);
 				break;
 			default:
-				elog(ABORT, "_hash_setpagelock: invalid access (%d) on blk %x: %s",
+				elog(ERROR, "_hash_setpagelock: invalid access (%d) on blk %x: %s",
 					 access, blkno, RelationGetRelationName(rel));
 				break;
 		}
@@ -362,7 +362,7 @@ _hash_unsetpagelock(Relation rel,
 				RelationUnsetSingleRLockPage(rel, &iptr);
 				break;
 			default:
-				elog(ABORT, "_hash_unsetpagelock: invalid access (%d) on blk %x: %s",
+				elog(ERROR, "_hash_unsetpagelock: invalid access (%d) on blk %x: %s",
 					 access, blkno, RelationGetRelationName(rel));
 				break;
 		}
@@ -546,7 +546,7 @@ _hash_splitpage(Relation rel,
 		_hash_checkpage(opage, LH_OVERFLOW_PAGE);
 		if (PageIsEmpty(opage))
 		{
-			elog(ABORT, "_hash_splitpage: empty overflow page %d", oblkno);
+			elog(ERROR, "_hash_splitpage: empty overflow page %d", oblkno);
 		}
 		oopaque = (HashPageOpaque) PageGetSpecialPointer(opage);
 	}
@@ -588,7 +588,7 @@ _hash_splitpage(Relation rel,
 				/* we're guaranteed that an ovfl page has at least 1 tuple */
 				if (PageIsEmpty(opage))
 				{
-					elog(ABORT, "_hash_splitpage: empty ovfl page %d!",
+					elog(ERROR, "_hash_splitpage: empty ovfl page %d!",
 						 oblkno);
 				}
 				ooffnum = FirstOffsetNumber;
@@ -685,7 +685,7 @@ _hash_splitpage(Relation rel,
 				oopaque = (HashPageOpaque) PageGetSpecialPointer(opage);
 				if (PageIsEmpty(opage))
 				{
-					elog(ABORT, "_hash_splitpage: empty overflow page %d",
+					elog(ERROR, "_hash_splitpage: empty overflow page %d",
 						 oblkno);
 				}
 				ooffnum = FirstOffsetNumber;
diff --git a/src/backend/access/hash/hashscan.c b/src/backend/access/hash/hashscan.c
index 5a708dd2298..848f8d9e1b4 100644
--- a/src/backend/access/hash/hashscan.c
+++ b/src/backend/access/hash/hashscan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.12 1998/01/05 03:29:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.13 1998/01/07 21:01:13 momjian Exp $
  *
  * NOTES
  *	  Because we can be doing an index scan on a relation while we
@@ -76,7 +76,7 @@ _hash_dropscan(IndexScanDesc scan)
 	}
 
 	if (chk == (HashScanList) NULL)
-		elog(ABORT, "hash scan list trashed; can't find 0x%lx", scan);
+		elog(ERROR, "hash scan list trashed; can't find 0x%lx", scan);
 
 	if (last == (HashScanList) NULL)
 		HashScans = chk->hashsl_next;
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index 2540e1f049e..64c7233533b 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.12 1998/01/05 03:29:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.13 1998/01/07 21:01:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -79,7 +79,7 @@ _hash_formitem(IndexTuple itup)
 
 	/* disallow nulls in hash keys */
 	if (itup->t_info & INDEX_NULL_MASK)
-		elog(ABORT, "hash indices cannot include null keys");
+		elog(ERROR, "hash indices cannot include null keys");
 
 	/* make a copy of the index tuple with room for the sequence number */
 	tuplen = IndexTupleSize(itup);
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index d31ccde6a73..45e1a29db58 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.24 1998/01/05 03:29:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.25 1998/01/07 21:01:20 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -295,7 +295,7 @@ heapgettup(Relation relation,
 
 #ifndef NO_BUFFERISVALID
 		if (!BufferIsValid(*b))
-			elog(ABORT, "heapgettup: failed ReadBuffer");
+			elog(ERROR, "heapgettup: failed ReadBuffer");
 #endif
 
 		dp = (Page) BufferGetPage(*b);
@@ -334,7 +334,7 @@ heapgettup(Relation relation,
 #ifndef NO_BUFFERISVALID
 		if (!BufferIsValid(*b))
 		{
-			elog(ABORT, "heapgettup: failed ReadBuffer");
+			elog(ERROR, "heapgettup: failed ReadBuffer");
 		}
 #endif
 
@@ -381,7 +381,7 @@ heapgettup(Relation relation,
 #ifndef NO_BUFFERISVALID
 		if (!BufferIsValid(*b))
 		{
-			elog(ABORT, "heapgettup: failed ReadBuffer");
+			elog(ERROR, "heapgettup: failed ReadBuffer");
 		}
 #endif
 
@@ -477,7 +477,7 @@ heapgettup(Relation relation,
 #ifndef NO_BUFFERISVALID
 		if (!BufferIsValid(*b))
 		{
-			elog(ABORT, "heapgettup: failed ReadBuffer");
+			elog(ERROR, "heapgettup: failed ReadBuffer");
 		}
 #endif
 		dp = (Page) BufferGetPage(*b);
@@ -545,7 +545,7 @@ heap_open(Oid relationId)
 
 	if (RelationIsValid(r) && r->rd_rel->relkind == RELKIND_INDEX)
 	{
-		elog(ABORT, "%s is an index relation", r->rd_rel->relname.data);
+		elog(ERROR, "%s is an index relation", r->rd_rel->relname.data);
 	}
 
 	return (r);
@@ -574,7 +574,7 @@ heap_openr(char *relationName)
 
 	if (RelationIsValid(r) && r->rd_rel->relkind == RELKIND_INDEX)
 	{
-		elog(ABORT, "%s is an index relation", r->rd_rel->relname.data);
+		elog(ERROR, "%s is an index relation", r->rd_rel->relname.data);
 	}
 
 	return (r);
@@ -626,7 +626,7 @@ heap_beginscan(Relation relation,
 	 * ----------------
 	 */
 	if (RelationIsValid(relation) == false)
-		elog(ABORT, "heap_beginscan: !RelationIsValid(relation)");
+		elog(ERROR, "heap_beginscan: !RelationIsValid(relation)");
 
 	/* ----------------
 	 * set relation level read lock
@@ -808,7 +808,7 @@ heap_getnext(HeapScanDesc scandesc,
 	 * ----------------
 	 */
 	if (sdesc == NULL)
-		elog(ABORT, "heap_getnext: NULL relscan");
+		elog(ERROR, "heap_getnext: NULL relscan");
 
 	/* ----------------
 	 *	initialize return buffer to InvalidBuffer
@@ -1051,7 +1051,7 @@ heap_fetch(Relation relation,
 #ifndef NO_BUFFERISVALID
 	if (!BufferIsValid(buffer))
 	{
-		elog(ABORT, "heap_fetch: %s relation: ReadBuffer(%lx) failed",
+		elog(ERROR, "heap_fetch: %s relation: ReadBuffer(%lx) failed",
 			 &relation->rd_rel->relname, (long) tid);
 	}
 #endif
@@ -1216,7 +1216,7 @@ heap_delete(Relation relation, ItemPointer tid)
 #ifndef NO_BUFFERISVALID
 	if (!BufferIsValid(b))
 	{							/* XXX L_SH better ??? */
-		elog(ABORT, "heap_delete: failed ReadBuffer");
+		elog(ERROR, "heap_delete: failed ReadBuffer");
 	}
 #endif							/* NO_BUFFERISVALID */
 
@@ -1249,7 +1249,7 @@ heap_delete(Relation relation, ItemPointer tid)
 		/* XXX call something else */
 		ReleaseBuffer(b);
 
-		elog(ABORT, "heap_delete: (am)invalid tid");
+		elog(ERROR, "heap_delete: (am)invalid tid");
 	}
 
 	/* ----------------
@@ -1329,7 +1329,7 @@ heap_replace(Relation relation, ItemPointer otid, HeapTuple tup)
 	if (!BufferIsValid(buffer))
 	{
 		/* XXX L_SH better ??? */
-		elog(ABORT, "amreplace: failed ReadBuffer");
+		elog(ERROR, "amreplace: failed ReadBuffer");
 	}
 #endif							/* NO_BUFFERISVALID */
 
@@ -1385,7 +1385,7 @@ heap_replace(Relation relation, ItemPointer otid, HeapTuple tup)
 	if (!tuple)
 	{
 		ReleaseBuffer(buffer);
-		elog(ABORT, "heap_replace: (am)invalid otid");
+		elog(ERROR, "heap_replace: (am)invalid otid");
 	}
 
 	/* XXX order problems if not atomic assignment ??? */
diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c
index 41e3b9e45db..0e1408e9594 100644
--- a/src/backend/access/heap/hio.c
+++ b/src/backend/access/heap/hio.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Id: hio.c,v 1.12 1998/01/05 03:29:30 momjian Exp $
+ *	  $Id: hio.c,v 1.13 1998/01/07 21:01:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -60,7 +60,7 @@ RelationPutHeapTuple(Relation relation,
 #ifndef NO_BUFFERISVALID
 	if (!BufferIsValid(buffer))
 	{
-		elog(ABORT, "RelationPutHeapTuple: no buffer for %ld in %s",
+		elog(ERROR, "RelationPutHeapTuple: no buffer for %ld in %s",
 			 blockIndex, &relation->rd_rel->relname);
 	}
 #endif
@@ -157,7 +157,7 @@ RelationPutHeapTupleAtEnd(Relation relation, HeapTuple tuple)
 		PageInit(pageHeader, BufferGetPageSize(buffer), 0);
 
 		if (len > PageGetFreeSpace(pageHeader))
-			elog(ABORT, "Tuple is too big: size %d", len);
+			elog(ERROR, "Tuple is too big: size %d", len);
 	}
 
 	offnum = PageAddItem((Page) pageHeader, (Item) tuple,
diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c
index f503326e99f..7fc9607b441 100644
--- a/src/backend/access/index/genam.c
+++ b/src/backend/access/index/genam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.10 1998/01/05 03:29:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.11 1998/01/07 21:01:35 momjian Exp $
  *
  * NOTES
  *	  many of the old access method routines have been turned into
@@ -101,7 +101,7 @@ RelationGetIndexScan(Relation relation,
 	IndexScanDesc scan;
 
 	if (!RelationIsValid(relation))
-		elog(ABORT, "RelationGetIndexScan: relation invalid");
+		elog(ERROR, "RelationGetIndexScan: relation invalid");
 
 	scan = (IndexScanDesc) palloc(sizeof(IndexScanDescData));
 
@@ -150,7 +150,7 @@ IndexScanRestart(IndexScanDesc scan,
 				 ScanKey key)
 {
 	if (!IndexScanIsValid(scan))
-		elog(ABORT, "IndexScanRestart: invalid scan");
+		elog(ERROR, "IndexScanRestart: invalid scan");
 
 	ItemPointerSetInvalid(&scan->previousItemData);
 	ItemPointerSetInvalid(&scan->currentItemData);
@@ -191,7 +191,7 @@ void
 IndexScanEnd(IndexScanDesc scan)
 {
 	if (!IndexScanIsValid(scan))
-		elog(ABORT, "IndexScanEnd: invalid scan");
+		elog(ERROR, "IndexScanEnd: invalid scan");
 
 	pfree(scan);
 }
@@ -274,7 +274,7 @@ void
 IndexScanRestorePosition(IndexScanDesc scan)
 {
 	if (scan->flags & ScanUnmarked)
-		elog(ABORT, "IndexScanRestorePosition: no mark to restore");
+		elog(ERROR, "IndexScanRestorePosition: no mark to restore");
 
 	scan->previousItemData = scan->previousMarkData;
 	scan->currentItemData = scan->currentMarkData;
diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
index 16d57de0b37..e023ef62a85 100644
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.18 1998/01/05 03:29:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.19 1998/01/07 21:01:42 momjian Exp $
  *
  * INTERFACE ROUTINES
  *		index_open		- open an index relation by relationId
@@ -103,13 +103,13 @@ Assert(RelationIsValid(relation)); \
 #define GET_REL_PROCEDURE(x,y) \
 		 procedure = relation->rd_am->y; \
 		 if (! RegProcedureIsValid(procedure)) \
-		 elog(ABORT, "index_%s: invalid %s regproc", \
+		 elog(ERROR, "index_%s: invalid %s regproc", \
 			  CppAsString(x), CppAsString(y))
 
 #define GET_SCAN_PROCEDURE(x,y) \
 		 procedure = scan->relation->rd_am->y; \
 		 if (! RegProcedureIsValid(procedure)) \
-		 elog(ABORT, "index_%s: invalid %s regproc", \
+		 elog(ERROR, "index_%s: invalid %s regproc", \
 			  CppAsString(x), CppAsString(y))
 
 
diff --git a/src/backend/access/index/istrat.c b/src/backend/access/index/istrat.c
index 4a5c1da3b0e..3fc972a09a1 100644
--- a/src/backend/access/index/istrat.c
+++ b/src/backend/access/index/istrat.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.14 1998/01/05 03:29:38 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.15 1998/01/07 21:01:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -349,7 +349,7 @@ RelationGetStrategy(Relation relation,
 	{
 		if (!StrategyNumberIsValid(strategy))
 		{
-			elog(ABORT, "RelationGetStrategy: corrupted evaluation");
+			elog(ERROR, "RelationGetStrategy: corrupted evaluation");
 		}
 	}
 
@@ -481,7 +481,7 @@ RelationInvokeStrategy(Relation relation,
 		}
 	}
 
-	elog(ABORT, "RelationInvokeStrategy: cannot evaluate strategy %d",
+	elog(ERROR, "RelationInvokeStrategy: cannot evaluate strategy %d",
 		 strategy);
 
 	/* not reached, just to make compiler happy */
@@ -514,7 +514,7 @@ OperatorRelationFillScanKeyEntry(Relation operatorRelation,
 	tuple = heap_getnext(scan, false, (Buffer *) NULL);
 	if (!HeapTupleIsValid(tuple))
 	{
-		elog(ABORT, "OperatorObjectIdFillScanKeyEntry: unknown operator %lu",
+		elog(ERROR, "OperatorObjectIdFillScanKeyEntry: unknown operator %lu",
 			 (uint32) operatorObjectId);
 	}
 
@@ -525,7 +525,7 @@ OperatorRelationFillScanKeyEntry(Relation operatorRelation,
 
 	if (!RegProcedureIsValid(entry->sk_procedure))
 	{
-		elog(ABORT,
+		elog(ERROR,
 		"OperatorObjectIdFillScanKeyEntry: no procedure for operator %lu",
 			 (uint32) operatorObjectId);
 	}
@@ -567,7 +567,7 @@ IndexSupportInitialize(IndexStrategy indexStrategy,
 	scan = heap_beginscan(relation, false, false, 1, entry);
 	tuple = heap_getnext(scan, 0, (Buffer *) NULL);
 	if (!HeapTupleIsValid(tuple))
-		elog(ABORT, "IndexSupportInitialize: corrupted catalogs");
+		elog(ERROR, "IndexSupportInitialize: corrupted catalogs");
 
 	/*
 	 * XXX note that the following assumes the INDEX tuple is well formed
@@ -583,7 +583,7 @@ IndexSupportInitialize(IndexStrategy indexStrategy,
 		{
 			if (attributeIndex == 0)
 			{
-				elog(ABORT, "IndexSupportInitialize: no pg_index tuple");
+				elog(ERROR, "IndexSupportInitialize: no pg_index tuple");
 			}
 			break;
 		}
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index c57c1e6f767..c903c6fd34a 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.23 1998/01/05 03:29:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.24 1998/01/07 21:01:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -123,7 +123,7 @@ _bt_doinsert(Relation rel, BTItem btitem, bool index_is_unique, Relation heapRel
 				htup = heap_fetch(heapRel, true, &(itup->t_tid), NULL);
 				if (htup != (HeapTuple) NULL)
 				{				/* it is a duplicate */
-					elog(ABORT, "Cannot insert a duplicate key into a unique index");
+					elog(ERROR, "Cannot insert a duplicate key into a unique index");
 				}
 				/* get next offnum */
 				if (offset < maxoff)
@@ -1442,7 +1442,7 @@ _bt_updateitem(Relation rel,
 	 * if(IndexTupleDSize(newItem->bti_itup) >
 	 * IndexTupleDSize(item->bti_itup)) { elog(NOTICE, "trying to
 	 * overwrite a smaller value with a bigger one in _bt_updateitem");
-	 * elog(ABORT, "this is not good."); }
+	 * elog(ERROR, "this is not good."); }
 	 */
 
 	oldIndexTuple = &(item->bti_itup);
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index 7e0f76398d3..1d714166558 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.14 1998/01/05 03:29:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.15 1998/01/07 21:01:53 momjian Exp $
  *
  *	NOTES
  *	   Postgres btree pages look like ordinary relation pages.	The opaque
@@ -97,7 +97,7 @@ _bt_metapinit(Relation rel)
 
 	if ((nblocks = RelationGetNumberOfBlocks(rel)) != 0)
 	{
-		elog(ABORT, "Cannot initialize non-empty btree %s",
+		elog(ERROR, "Cannot initialize non-empty btree %s",
 			 RelationGetRelationName(rel));
 	}
 
@@ -146,20 +146,20 @@ _bt_checkmeta(Relation rel)
 	op = (BTPageOpaque) PageGetSpecialPointer(metap);
 	if (!(op->btpo_flags & BTP_META))
 	{
-		elog(ABORT, "Invalid metapage for index %s",
+		elog(ERROR, "Invalid metapage for index %s",
 			 RelationGetRelationName(rel));
 	}
 	metad = BTPageGetMeta(metap);
 
 	if (metad->btm_magic != BTREE_MAGIC)
 	{
-		elog(ABORT, "Index %s is not a btree",
+		elog(ERROR, "Index %s is not a btree",
 			 RelationGetRelationName(rel));
 	}
 
 	if (metad->btm_version != BTREE_VERSION)
 	{
-		elog(ABORT, "Version mismatch on %s:  version %d file, version %d code",
+		elog(ERROR, "Version mismatch on %s:  version %d file, version %d code",
 			 RelationGetRelationName(rel),
 			 metad->btm_version, BTREE_VERSION);
 	}
@@ -204,13 +204,13 @@ _bt_getroot(Relation rel, int access)
 
 	if (metad->btm_magic != BTREE_MAGIC)
 	{
-		elog(ABORT, "Index %s is not a btree",
+		elog(ERROR, "Index %s is not a btree",
 			 RelationGetRelationName(rel));
 	}
 
 	if (metad->btm_version != BTREE_VERSION)
 	{
-		elog(ABORT, "Version mismatch on %s:  version %d file, version %d code",
+		elog(ERROR, "Version mismatch on %s:  version %d file, version %d code",
 			 RelationGetRelationName(rel),
 			 metad->btm_version, BTREE_VERSION);
 	}
diff --git a/src/backend/access/nbtree/nbtscan.c b/src/backend/access/nbtree/nbtscan.c
index 510c72d2c80..2462a54d099 100644
--- a/src/backend/access/nbtree/nbtscan.c
+++ b/src/backend/access/nbtree/nbtscan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.11 1998/01/05 03:29:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.12 1998/01/07 21:01:54 momjian Exp $
  *
  *
  * NOTES
@@ -77,7 +77,7 @@ _bt_dropscan(IndexScanDesc scan)
 	}
 
 	if (chk == (BTScanList) NULL)
-		elog(ABORT, "btree scan list trashed; can't find 0x%lx", scan);
+		elog(ERROR, "btree scan list trashed; can't find 0x%lx", scan);
 
 	if (last == (BTScanList) NULL)
 		BTScans = chk->btsl_next;
@@ -154,7 +154,7 @@ _bt_scandel(IndexScanDesc scan, int op, BlockNumber blkno, OffsetNumber offno)
 				_bt_step(scan, &buf, BackwardScanDirection);
 				break;
 			default:
-				elog(ABORT, "_bt_scandel: bad operation '%d'", op);
+				elog(ERROR, "_bt_scandel: bad operation '%d'", op);
 				/* NOTREACHED */
 		}
 		so->btso_curbuf = buf;
@@ -179,7 +179,7 @@ _bt_scandel(IndexScanDesc scan, int op, BlockNumber blkno, OffsetNumber offno)
 				_bt_step(scan, &buf, BackwardScanDirection);
 				break;
 			default:
-				elog(ABORT, "_bt_scandel: bad operation '%d'", op);
+				elog(ERROR, "_bt_scandel: bad operation '%d'", op);
 				/* NOTREACHED */
 		}
 		so->btso_mrkbuf = buf;
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index a0f6fa7b34a..f763af2ee76 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.28 1998/01/05 03:29:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.29 1998/01/07 21:01:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -617,7 +617,7 @@ _bt_compare(Relation rel,
 		 */
 		if (!P_RIGHTMOST(opaque))
 		{
-			elog(ABORT, "_bt_compare: invalid comparison to high key");
+			elog(ERROR, "_bt_compare: invalid comparison to high key");
 		}
 
 #if 0
@@ -839,7 +839,7 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 	/* _bt_orderkeys disallows it, but it's place to add some code latter */
 	if (so->keyData[0].sk_flags & SK_ISNULL)
 	{
-		elog(ABORT, "_bt_first: btree doesn't support is(not)null, yet");
+		elog(ERROR, "_bt_first: btree doesn't support is(not)null, yet");
 		return ((RetrieveIndexResult) NULL);
 	}
 	proc = index_getprocid(rel, 1, BTORDER_PROC);
@@ -1331,7 +1331,7 @@ _bt_twostep(IndexScanDesc scan, Buffer *bufP, ScanDirection dir)
 	 * us up less often since they're only done by the vacuum daemon.
 	 */
 
-	elog(ABORT, "btree synchronization error:  concurrent update botched scan");
+	elog(ERROR, "btree synchronization error:  concurrent update botched scan");
 
 	return (false);
 }
@@ -1416,7 +1416,7 @@ _bt_endpoint(IndexScanDesc scan, ScanDirection dir)
 	if (ScanDirectionIsForward(dir))
 	{
 		if (!P_LEFTMOST(opaque))/* non-leftmost page ? */
-			elog(ABORT, "_bt_endpoint: leftmost page (%u) has not leftmost flag", blkno);
+			elog(ERROR, "_bt_endpoint: leftmost page (%u) has not leftmost flag", blkno);
 		start = P_RIGHTMOST(opaque) ? P_HIKEY : P_FIRSTKEY;
 
 		/*
@@ -1440,7 +1440,7 @@ _bt_endpoint(IndexScanDesc scan, ScanDirection dir)
 		if (PageIsEmpty(page))
 		{
 			if (start != P_HIKEY)		/* non-rightmost page */
-				elog(ABORT, "_bt_endpoint: non-rightmost page (%u) is empty", blkno);
+				elog(ERROR, "_bt_endpoint: non-rightmost page (%u) is empty", blkno);
 
 			/*
 			 * It's left- & right- most page - root page, - and it's
@@ -1512,7 +1512,7 @@ _bt_endpoint(IndexScanDesc scan, ScanDirection dir)
 	}
 	else
 	{
-		elog(ABORT, "Illegal scan direction %d", dir);
+		elog(ERROR, "Illegal scan direction %d", dir);
 	}
 
 	btitem = (BTItem) PageGetItem(page, PageGetItemId(page, start));
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index 1d17bd0eaa3..e292e21b7af 100644
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -5,7 +5,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Id: nbtsort.c,v 1.25 1998/01/05 03:29:55 momjian Exp $
+ *	  $Id: nbtsort.c,v 1.26 1998/01/07 21:01:59 momjian Exp $
  *
  * NOTES
  *
@@ -212,7 +212,7 @@ _bt_isortcmp(BTSortKey *k1, BTSortKey *k2)
 	if (_bt_inspool->isunique && !equal_isnull)
 	{
 		_bt_spooldestroy((void *) _bt_inspool);
-		elog(ABORT, "Cannot create unique index. Table contains non-unique values");
+		elog(ERROR, "Cannot create unique index. Table contains non-unique values");
 	}
 	return (0);					/* 1 = 2 */
 }
@@ -333,7 +333,7 @@ _bt_pqadd(BTPriQueue *q, BTPriQueueElem *e)
 
 	if (q->btpq_nelem >= MAXELEM)
 	{
-		elog(ABORT, "_bt_pqadd: queue overflow");
+		elog(ERROR, "_bt_pqadd: queue overflow");
 	}
 
 	child = q->btpq_nelem++;
@@ -426,7 +426,7 @@ _bt_tapecreate(char *fname)
 
 	if (tape == (BTTapeBlock *) NULL)
 	{
-		elog(ABORT, "_bt_tapecreate: out of memory");
+		elog(ERROR, "_bt_tapecreate: out of memory");
 	}
 
 	tape->bttb_magic = BTTAPEMAGIC;
@@ -563,7 +563,7 @@ _bt_spoolinit(Relation index, int ntapes, bool isunique)
 
 	if (btspool == (BTSpool *) NULL || fname == (char *) NULL)
 	{
-		elog(ABORT, "_bt_spoolinit: out of memory");
+		elog(ERROR, "_bt_spoolinit: out of memory");
 	}
 	MemSet((char *) btspool, 0, sizeof(BTSpool));
 	btspool->bts_ntapes = ntapes;
@@ -577,7 +577,7 @@ _bt_spoolinit(Relation index, int ntapes, bool isunique)
 	if (btspool->bts_itape == (BTTapeBlock **) NULL ||
 		btspool->bts_otape == (BTTapeBlock **) NULL)
 	{
-		elog(ABORT, "_bt_spoolinit: out of memory");
+		elog(ERROR, "_bt_spoolinit: out of memory");
 	}
 
 	for (i = 0; i < ntapes; ++i)
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index 33b5cc56d89..ce6b3449de2 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.16 1998/01/05 03:29:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.17 1998/01/07 21:02:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -119,7 +119,7 @@ _bt_orderkeys(Relation relation, BTScanOpaque so)
 
 	cur = &key[0];
 	if (cur->sk_attno != 1)
-		elog(ABORT, "_bt_orderkeys: key(s) for attribute 1 missed");
+		elog(ERROR, "_bt_orderkeys: key(s) for attribute 1 missed");
 
 	if (numberOfKeys == 1)
 	{
@@ -159,7 +159,7 @@ _bt_orderkeys(Relation relation, BTScanOpaque so)
 		{
 			if (cur->sk_attno != attno + 1 && i < numberOfKeys)
 			{
-				elog(ABORT, "_bt_orderkeys: key(s) for attribute %d missed", attno + 1);
+				elog(ERROR, "_bt_orderkeys: key(s) for attribute %d missed", attno + 1);
 			}
 
 			/*
@@ -296,7 +296,7 @@ _bt_formitem(IndexTuple itup)
 	/*
 	 * see comments in btbuild
 	 *
-	 * if (itup->t_info & INDEX_NULL_MASK) elog(ABORT, "btree indices cannot
+	 * if (itup->t_info & INDEX_NULL_MASK) elog(ERROR, "btree indices cannot
 	 * include null keys");
 	 */
 
diff --git a/src/backend/access/rtree/rtproc.c b/src/backend/access/rtree/rtproc.c
index dda0fc42634..af46780446b 100644
--- a/src/backend/access/rtree/rtproc.c
+++ b/src/backend/access/rtree/rtproc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.14 1998/01/07 18:46:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.15 1998/01/07 21:02:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,7 +29,7 @@ rt_box_union(BOX *a, BOX *b)
 	BOX		   *n;
 
 	if ((n = (BOX *) palloc(sizeof(*n))) == (BOX *) NULL)
-		elog(ABORT, "Cannot allocate box for union");
+		elog(ERROR, "Cannot allocate box for union");
 
 	n->high.x = Max(a->high.x, b->high.x);
 	n->high.y = Max(a->high.y, b->high.y);
@@ -45,7 +45,7 @@ rt_box_inter(BOX *a, BOX *b)
 	BOX		   *n;
 
 	if ((n = (BOX *) palloc(sizeof(*n))) == (BOX *) NULL)
-		elog(ABORT, "Cannot allocate box for union");
+		elog(ERROR, "Cannot allocate box for union");
 
 	n->high.x = Min(a->high.x, b->high.x);
 	n->high.y = Min(a->high.y, b->high.y);
@@ -94,7 +94,7 @@ rt_poly_union(POLYGON *a, POLYGON *b)
 	p = (POLYGON *) palloc(sizeof(POLYGON));
 
 	if (!PointerIsValid(p))
-		elog(ABORT, "Cannot allocate polygon for union");
+		elog(ERROR, "Cannot allocate polygon for union");
 
 	MemSet((char *) p, 0, sizeof(POLYGON));		/* zero any holes */
 	p->size = sizeof(POLYGON);
@@ -136,7 +136,7 @@ rt_poly_inter(POLYGON *a, POLYGON *b)
 	p = (POLYGON *) palloc(sizeof(POLYGON));
 
 	if (!PointerIsValid(p))
-		elog(ABORT, "Cannot allocate polygon for intersection");
+		elog(ERROR, "Cannot allocate polygon for intersection");
 
 	MemSet((char *) p, 0, sizeof(POLYGON));		/* zero any holes */
 	p->size = sizeof(POLYGON);
diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c
index c85a6f7106d..ac39b4d99b6 100644
--- a/src/backend/access/rtree/rtree.c
+++ b/src/backend/access/rtree/rtree.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.20 1998/01/05 03:30:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.21 1998/01/07 21:02:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -125,7 +125,7 @@ rtbuild(Relation heap,
 	 */
 
 	if (oldPred == NULL && (nb = RelationGetNumberOfBlocks(index)) != 0)
-		elog(ABORT, "%s already contains data", index->rd_rel->relname.data);
+		elog(ERROR, "%s already contains data", index->rd_rel->relname.data);
 
 	/* initialize the root page (if this is a new index) */
 	if (oldPred == NULL)
@@ -664,7 +664,7 @@ rtintinsert(Relation r,
 	 */
 
 	if (IndexTupleSize(old) != IndexTupleSize(ltup))
-		elog(ABORT, "Variable-length rtree keys are not supported.");
+		elog(ERROR, "Variable-length rtree keys are not supported.");
 
 	/* install pointer to left child */
 	memmove(old, ltup, IndexTupleSize(ltup));
diff --git a/src/backend/access/rtree/rtscan.c b/src/backend/access/rtree/rtscan.c
index e6fd7ae3e1d..2d47500e982 100644
--- a/src/backend/access/rtree/rtscan.c
+++ b/src/backend/access/rtree/rtscan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.14 1998/01/05 03:30:05 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.15 1998/01/07 21:02:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -85,7 +85,7 @@ rtrescan(IndexScanDesc s, bool fromEnd, ScanKey key)
 
 	if (!IndexScanIsValid(s))
 	{
-		elog(ABORT, "rtrescan: invalid scan.");
+		elog(ERROR, "rtrescan: invalid scan.");
 		return;
 	}
 
@@ -284,7 +284,7 @@ rtdropscan(IndexScanDesc s)
 	}
 
 	if (l == (RTScanList) NULL)
-		elog(ABORT, "rtree scan list corrupted -- cannot find 0x%lx", s);
+		elog(ERROR, "rtree scan list corrupted -- cannot find 0x%lx", s);
 
 	if (prev == (RTScanList) NULL)
 		RTScans = l->rtsl_next;
@@ -400,7 +400,7 @@ adjustiptr(IndexScanDesc s,
 					break;
 
 				default:
-					elog(ABORT, "Bad operation in rtree scan adjust: %d", op);
+					elog(ERROR, "Bad operation in rtree scan adjust: %d", op);
 			}
 		}
 	}
diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c
index 8985e5ff0c6..e864a2ead33 100644
--- a/src/backend/access/transam/transam.c
+++ b/src/backend/access/transam/transam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.15 1998/01/05 03:30:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.16 1998/01/07 21:02:17 momjian Exp $
  *
  * NOTES
  *	  This file contains the high level access-method interface to the
@@ -183,7 +183,7 @@ TransactionLogTest(TransactionId transactionId, /* transaction id to test */
 	 *	  here the block didn't contain the information we wanted
 	 * ----------------
 	 */
-	elog(ABORT, "TransactionLogTest: failed to get xidstatus");
+	elog(ERROR, "TransactionLogTest: failed to get xidstatus");
 
 	/*
 	 * so lint is happy...
@@ -308,7 +308,7 @@ TransRecover(Relation logRelation)
 	 */
 	TransGetLastRecordedTransaction(logRelation, logLastXid, &fail);
 	if (fail == true)
-		elog(ABORT, "TransRecover: failed TransGetLastRecordedTransaction");
+		elog(ERROR, "TransRecover: failed TransGetLastRecordedTransaction");
 
 	/* ----------------
 	 *	  next get the "last" and "next" variables
@@ -322,7 +322,7 @@ TransRecover(Relation logRelation)
 	 * ----------------
 	 */
 	if (TransactionIdIsLessThan(varNextXid, logLastXid))
-		elog(ABORT, "TransRecover: varNextXid < logLastXid");
+		elog(ERROR, "TransRecover: varNextXid < logLastXid");
 
 	/* ----------------
 	 *	  intregity test (2)
diff --git a/src/backend/access/transam/transsup.c b/src/backend/access/transam/transsup.c
index 4de186da4fd..51879019c89 100644
--- a/src/backend/access/transam/transsup.c
+++ b/src/backend/access/transam/transsup.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.15 1998/01/05 03:30:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.16 1998/01/07 21:02:19 momjian Exp $
  *
  * NOTES
  *	  This file contains support functions for the high
@@ -68,7 +68,7 @@ TransComputeBlockNumber(Relation relation,		/* relation to test */
 	if (relation == LogRelation)
 		itemsPerBlock = TP_NumXidStatusPerBlock;
 	else
-		elog(ABORT, "TransComputeBlockNumber: unknown relation");
+		elog(ERROR, "TransComputeBlockNumber: unknown relation");
 
 	/* ----------------
 	 *	warning! if the transaction id's get too large
diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c
index 2474a6ac81a..fcc68fae6da 100644
--- a/src/backend/access/transam/varsup.c
+++ b/src/backend/access/transam/varsup.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.14 1998/01/05 03:30:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.15 1998/01/07 21:02:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -69,7 +69,7 @@ VariableRelationGetNextXid(TransactionId *xidP)
 	if (!BufferIsValid(buf))
 	{
 		SpinRelease(OidGenLockId);
-		elog(ABORT, "VariableRelationGetNextXid: ReadBuffer failed");
+		elog(ERROR, "VariableRelationGetNextXid: ReadBuffer failed");
 	}
 
 	var = (VariableRelationContents) BufferGetBlock(buf);
@@ -112,7 +112,7 @@ VariableRelationPutNextXid(TransactionId xid)
 	if (!BufferIsValid(buf))
 	{
 		SpinRelease(OidGenLockId);
-		elog(ABORT, "VariableRelationPutNextXid: ReadBuffer failed");
+		elog(ERROR, "VariableRelationPutNextXid: ReadBuffer failed");
 	}
 
 	var = (VariableRelationContents) BufferGetBlock(buf);
@@ -164,7 +164,7 @@ VariableRelationGetNextOid(Oid *oid_return)
 	if (!BufferIsValid(buf))
 	{
 		SpinRelease(OidGenLockId);
-		elog(ABORT, "VariableRelationGetNextXid: ReadBuffer failed");
+		elog(ERROR, "VariableRelationGetNextXid: ReadBuffer failed");
 	}
 
 	var = (VariableRelationContents) BufferGetBlock(buf);
@@ -224,7 +224,7 @@ VariableRelationPutNextOid(Oid *oidP)
 	if (!PointerIsValid(oidP))
 	{
 		SpinRelease(OidGenLockId);
-		elog(ABORT, "VariableRelationPutNextOid: invalid oid pointer");
+		elog(ERROR, "VariableRelationPutNextOid: invalid oid pointer");
 	}
 
 	/* ----------------
@@ -237,7 +237,7 @@ VariableRelationPutNextOid(Oid *oidP)
 	if (!BufferIsValid(buf))
 	{
 		SpinRelease(OidGenLockId);
-		elog(ABORT, "VariableRelationPutNextOid: ReadBuffer failed");
+		elog(ERROR, "VariableRelationPutNextOid: ReadBuffer failed");
 	}
 
 	var = (VariableRelationContents) BufferGetBlock(buf);
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 119dcd97f47..a88bd514b9f 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.18 1998/01/05 03:30:13 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.19 1998/01/07 21:02:24 momjian Exp $
  *
  * NOTES
  *		Transaction aborts can now occur two ways:
@@ -497,7 +497,7 @@ CommandCounterIncrement()
 	if (CurrentTransactionStateData.commandId == FirstCommandId)
 	{
 		CommandIdCounterOverflowFlag = true;
-		elog(ABORT, "You may only have 2^32-1 commands per transaction");
+		elog(ERROR, "You may only have 2^32-1 commands per transaction");
 	}
 
 	CurrentTransactionStateData.scanCommandId =