summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian1998-06-16 02:53:26 +0000
committerBruce Momjian1998-06-16 02:53:26 +0000
commitfce7556d339b574f4daf0f45c78fa7d5de62dc9a (patch)
tree0e54ee179df16dc00035d6208472e323769adf80
parenta0f95aceb4963731644b8eed0308beac76e9934c (diff)
Change error message and remove non-functional update message, from
Vadim.
-rw-r--r--src/backend/access/heap/heapam.c7
-rw-r--r--src/backend/tcop/utility.c4
2 files changed, 7 insertions, 4 deletions
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index d246f79151b..b23b658f409 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.28 1998/06/15 19:27:51 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.29 1998/06/16 02:53:25 momjian Exp $
*
*
* INTERFACE ROUTINES
@@ -1202,7 +1202,10 @@ heap_delete(Relation relation, ItemPointer tid)
Assert(HeapTupleIsValid(tp));
if (TupleUpdatedByCurXactAndCmd(tp))
{
- elog(NOTICE, "Non-functional delete, tuple already deleted");
+ /*
+ Vadim says this is no longer needed 1998/6/15
+ elog(NOTICE, "Non-functional delete, tuple already deleted");
+ */
if (IsSystemRelationName(RelationGetRelationName(relation)->data))
RelationUnsetLockForWrite(relation);
ReleaseBuffer(b);
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index f34c56f4130..d66cfa365c8 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.41 1998/06/15 19:29:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.42 1998/06/16 02:53:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -74,7 +74,7 @@ if (1) \
if (IsAbortedTransactionBlockState()) \
{ \
elog(NOTICE, "(transaction aborted): %s", \
- "queries ignored until END"); \
+ "all queries ignored until end of transaction block"); \
commandTag = "*ABORT STATE*"; \
break; \
} \