postgrespro
diff --git a/‎src/backend/commands/trigger.c
Lines changed: 5 additions & 3 deletions b/‎src/backend/commands/trigger.c
Lines changed: 5 additions & 3 deletions
diff --git a/‎src/backend/utils/adt/formatting.c
Lines changed: 10 additions & 4 deletions b/‎src/backend/utils/adt/formatting.c
Lines changed: 10 additions & 4 deletions
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.72 2000/07/03 03:57:03 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.73 2000/07/29 03:26:40 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -240,12 +240,14 @@ CreateTrigger(CreateTrigStmt *stmt)
 			strcat(args, "\\000");
 		}
 		values[Anum_pg_trigger_tgnargs - 1] = Int16GetDatum(nargs);
-		values[Anum_pg_trigger_tgargs - 1] = PointerGetDatum(byteain(args));
+		values[Anum_pg_trigger_tgargs - 1] = DirectFunctionCall1(byteain,
+													CStringGetDatum(args));
 	}
 	else
 	{
 		values[Anum_pg_trigger_tgnargs - 1] = Int16GetDatum(0);
-		values[Anum_pg_trigger_tgargs - 1] = PointerGetDatum(byteain(""));
+		values[Anum_pg_trigger_tgargs - 1] = DirectFunctionCall1(byteain,
+													CStringGetDatum(""));
 	}
 	MemSet(tgattr, 0, FUNC_MAX_ARGS * sizeof(int16));
 	values[Anum_pg_trigger_tgattr - 1] = PointerGetDatum(tgattr);
 
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------
  * formatting.c
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/formatting.c,v 1.19 2000/07/05 23:11:35 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/formatting.c,v 1.20 2000/07/29 03:26:41 tgl Exp $
  *
  *
  *	 Portions Copyright (c) 1999-2000, PostgreSQL, Inc
@@ -4066,7 +4066,9 @@ numeric_to_char(PG_FUNCTION_ARGS)
 		x = DatumGetNumeric(DirectFunctionCall2(numeric_round,
 					NumericGetDatum(value),
 					Int32GetDatum(0)));
-		numstr = orgnum = int_to_roman(numeric_int4(x));
+		numstr = orgnum =
+			int_to_roman(DatumGetInt32(DirectFunctionCall1(numeric_int4,
+													NumericGetDatum(x))));
 		pfree(x);
 	}
 	else
@@ -4080,8 +4082,12 @@ numeric_to_char(PG_FUNCTION_ARGS)
 			Numeric		b = DatumGetNumeric(DirectFunctionCall1(int4_numeric,
 							Int32GetDatum(Num.multi)));
 
-			x = numeric_power(a, b);
-			val = numeric_mul(value, x);
+			x = DatumGetNumeric(DirectFunctionCall2(numeric_power,
+													NumericGetDatum(a),
+													NumericGetDatum(b)));
+			val = DatumGetNumeric(DirectFunctionCall2(numeric_mul,
+													  NumericGetDatum(value),
+													  NumericGetDatum(x)));
 			pfree(x);
 			pfree(a);
 			pfree(b);
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.72 2000/07/03 03:57:03 tgl Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.73 2000/07/29 03:26:40 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -240,12 +240,14 @@ CreateTrigger(CreateTrigStmt *stmt)`
`240`	`240`	`strcat(args, "\\000");`
`241`	`241`	`}`
`242`	`242`	`values[Anum_pg_trigger_tgnargs - 1] = Int16GetDatum(nargs);`
`243`		`- values[Anum_pg_trigger_tgargs - 1] = PointerGetDatum(byteain(args));`
	`243`	`+ values[Anum_pg_trigger_tgargs - 1] = DirectFunctionCall1(byteain,`
	`244`	`+ CStringGetDatum(args));`
`244`	`245`	`}`
`245`	`246`	`else`
`246`	`247`	`{`
`247`	`248`	`values[Anum_pg_trigger_tgnargs - 1] = Int16GetDatum(0);`
`248`		`- values[Anum_pg_trigger_tgargs - 1] = PointerGetDatum(byteain(""));`
	`249`	`+ values[Anum_pg_trigger_tgargs - 1] = DirectFunctionCall1(byteain,`
	`250`	`+ CStringGetDatum(""));`
`249`	`251`	`}`
`250`	`252`	`MemSet(tgattr, 0, FUNC_MAX_ARGS * sizeof(int16));`
`251`	`253`	`values[Anum_pg_trigger_tgattr - 1] = PointerGetDatum(tgattr);`