summaryrefslogtreecommitdiff
path: root/src/backend/executor
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/executor')
-rw-r--r--src/backend/executor/execAmi.c4
-rw-r--r--src/backend/executor/execMain.c8
-rw-r--r--src/backend/executor/nodeIndexscan.c5
-rw-r--r--src/backend/executor/nodeMergejoin.c6
4 files changed, 10 insertions, 13 deletions
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index 83d0c3b6ca..7b8bde8e1b 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: execAmi.c,v 1.33 1999/03/23 16:50:47 momjian Exp $
+ * $Id: execAmi.c,v 1.34 1999/05/10 00:45:05 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -496,7 +496,7 @@ ExecCreatR(TupleDesc tupType,
{
Relation relDesc;
- EU3_printf("ExecCreatR: %s type=%d oid=%d\n",
+ EU3_printf("ExecCreatR: %s type=%d oid=%u\n",
"entering: ", tupType, relationOid);
CXT1_printf("ExecCreatR: context is %d\n", CurrentMemoryContext);
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index a4be9a3967..3565613bba 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -26,7 +26,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.82 1999/03/23 16:50:47 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.83 1999/05/10 00:45:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -459,8 +459,7 @@ ExecCheckPerms(CmdType operation,
ObjectIdGetDatum(relid),
0, 0, 0);
if (!HeapTupleIsValid(htup))
- elog(ERROR, "ExecCheckPerms: bogus RT relid: %d",
- relid);
+ elog(ERROR, "ExecCheckPerms: bogus RT relid: %u", relid);
StrNCpy(rname.data,
((Form_pg_class) GETSTRUCT(htup))->relname.data,
NAMEDATALEN);
@@ -520,8 +519,7 @@ ExecCheckPerms(CmdType operation,
ObjectIdGetDatum(relid),
0, 0, 0);
if (!HeapTupleIsValid(htup))
- elog(ERROR, "ExecCheckPerms: bogus RT relid: %d",
- relid);
+ elog(ERROR, "ExecCheckPerms: bogus RT relid: %u", relid);
StrNCpy(rname.data,
((Form_pg_class) GETSTRUCT(htup))->relname.data,
NAMEDATALEN);
diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index 16bb4f23b4..a55d9cc6e1 100644
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.34 1999/04/13 17:18:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.35 1999/05/10 00:45:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -703,8 +703,7 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent)
run_keys = (n_keys <= 0) ? NULL :
(int *) palloc(n_keys * sizeof(int));
- CXT1_printf("ExecInitIndexScan: context is %d\n",
- CurrentMemoryContext);
+ CXT1_printf("ExecInitIndexScan: context is %d\n",CurrentMemoryContext);
/* ----------------
* for each opclause in the given qual,
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c
index 4ecde52ab3..9b0df28825 100644
--- a/src/backend/executor/nodeMergejoin.c
+++ b/src/backend/executor/nodeMergejoin.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.25 1999/02/28 00:36:05 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.26 1999/05/10 00:45:07 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -149,7 +149,7 @@ MJFormSkipQual(List *qualList, char * replaceopname)
*/
optup = get_operator_tuple(op->opno);
if (!HeapTupleIsValid(optup)) /* shouldn't happen */
- elog(ERROR, "MJFormSkipQual: operator %d not found", op->opno);
+ elog(ERROR, "MJFormSkipQual: operator %u not found", op->opno);
opform = (Form_pg_operator) GETSTRUCT(optup);
oprleft = opform->oprleft;
oprright = opform->oprright;
@@ -166,7 +166,7 @@ MJFormSkipQual(List *qualList, char * replaceopname)
CharGetDatum('b'));
if (!HeapTupleIsValid(optup))
elog(ERROR,
- "MJFormSkipQual: mergejoin operator %d has no matching %s op",
+ "MJFormSkipQual: mergejoin operator %u has no matching %s op",
op->opno, replaceopname);
opform = (Form_pg_operator) GETSTRUCT(optup);