Change error message and remove non-functional update message, from

Vadim.

diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index d246f79151b4a59e9f115cb8e445f94da07367b1..b23b658f409d265c0c29d5aea6ede00a9acb1ae5 100644 (file)
--- 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 f34c56f4130abdb62f1f7f47b230536a1f556b51..d66cfa365c8171865c91fa5c45d3d26ab6284c2a 100644 (file)
--- 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; \
    } \