From 220ae48ccaebafd74074d0be5eae0080116951c9 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Mon, 17 Sep 2001 00:29:10 +0000
Subject: [PATCH] Suppress compiler warning.
---
src/backend/executor/execMain.c | 4 ++--
src/backend/utils/adt/tid.c | 16 ++++++++++------
src/include/access/heapam.h | 4 ++--
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 9caad11ae63..4061478427d 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -27,7 +27,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.146 2001/09/08 16:15:28 inoue Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.147 2001/09/17 00:29:10 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1268,11 +1268,11 @@ ExecAppend(TupleTableSlot *slot,
* insert the tuple
*/
newId = heap_insert(resultRelationDesc, tuple);
- setLastTid(&(tuple->t_self));
IncrAppended();
(estate->es_processed)++;
estate->es_lastoid = newId;
+ setLastTid(&(tuple->t_self));
/*
* process indices
diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c
index a09c2f8f4d7..4385b003deb 100644
--- a/src/backend/utils/adt/tid.c
+++ b/src/backend/utils/adt/tid.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.26 2001/09/08 16:15:28 inoue Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.27 2001/09/17 00:29:10 tgl Exp $
*
* NOTES
* input routine largely stolen from boxin().
@@ -124,11 +124,15 @@ tidne(PG_FUNCTION_ARGS)
*
* Maybe these implementations should be moved to another place
*/
-static ItemPointerData Current_last_tid = { {0, 0}, 0};
-void setLastTid(const ItemPointer tid)
-{
- Current_last_tid = *tid;
-}
+
+static ItemPointerData Current_last_tid = { {0, 0}, 0};
+
+void
+setLastTid(const ItemPointer tid)
+{
+ Current_last_tid = *tid;
+}
+
Datum
currtid_byreloid(PG_FUNCTION_ARGS)
{
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 0a44e709a45..095476083b3 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: heapam.h,v 1.67 2001/09/08 16:15:28 inoue Exp $
+ * $Id: heapam.h,v 1.68 2001/09/17 00:29:10 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -205,7 +205,7 @@ extern void heap_endscan(HeapScanDesc scan);
extern HeapTuple heap_getnext(HeapScanDesc scandesc, int backw);
extern void heap_fetch(Relation relation, Snapshot snapshot, HeapTuple tup, Buffer *userbuf, IndexScanDesc iscan);
extern ItemPointer heap_get_latest_tid(Relation relation, Snapshot snapshot, ItemPointer tid);
-extern void setLastid(const ItemPointer tid);
+extern void setLastTid(const ItemPointer tid);
extern Oid heap_insert(Relation relation, HeapTuple tup);
extern int heap_delete(Relation relation, ItemPointer tid, ItemPointer ctid);
extern int heap_update(Relation relation, ItemPointer otid, HeapTuple tup,
--
GitLab