postgres
diff --git a/‎src/backend/access/transam/xact.c
Lines changed: 6 additions & 6 deletions b/‎src/backend/access/transam/xact.c
Lines changed: 6 additions & 6 deletions
diff --git a/‎src/backend/postmaster/pgstat.c
Lines changed: 3 additions & 3 deletions b/‎src/backend/postmaster/pgstat.c
Lines changed: 3 additions & 3 deletions
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.160 2004/01/09 21:08:46 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.161 2004/01/26 22:51:55 momjian Exp $
  *
  * NOTES
  *		Transaction aborts can now occur two ways:
@@ -87,7 +87,7 @@
  *
  *		Support for transaction blocks is provided via the functions:
  *
- *				StartTransactionBlock
+ *				BeginTransactionBlock
  *				CommitTransactionBlock
  *				AbortTransactionBlock
  *
@@ -108,7 +108,7 @@
  *
  *			/	StartTransactionCommand();
  *		1) /	ProcessUtility();				<< begin
- *		   \		StartTransactionBlock();
+ *		   \		BeginTransactionBlock();
  *			\	CommitTransactionCommand();
  *
  *			/	StartTransactionCommand();
@@ -127,7 +127,7 @@
  *		The point of this example is to demonstrate the need for
  *		StartTransactionCommand() and CommitTransactionCommand() to
  *		be state smart -- they should do nothing in between the calls
- *		to StartTransactionBlock() and EndTransactionBlock() and
+ *		to BeginTransactionBlock() and EndTransactionBlock() and
  *		outside these calls they need to do normal start/commit
  *		processing.
  *
@@ -399,7 +399,7 @@ CommandIdIsCurrentCommandId(CommandId cid)
 {
 	TransactionState s = CurrentTransactionState;
 
-	return (cid == s->commandId) ? true : false;
+	return (cid == s->commandId);
 }
 
 
@@ -860,7 +860,7 @@ StartTransaction(void)
 	AtStart_Locks();
 
 	/*
-	 * Tell the trigger manager to we're starting a transaction
+	 * Tell the trigger manager we're starting a transaction
 	 */
 	DeferredTriggerBeginXact();
 
 
@@ -13,7 +13,7 @@
  *
  *	Copyright (c) 2001-2003, PostgreSQL Global Development Group
  *
- *	$PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.53 2004/01/11 03:49:31 momjian Exp $
+ *	$PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.54 2004/01/26 22:51:55 momjian Exp $
  * ----------
  */
 #include "postgres.h"
@@ -147,7 +147,7 @@ static void pgstat_recv_resetcounter(PgStat_MsgResetcounter *msg, int len);
 #define piperead(a,b,c)		read(a,b,c)
 #define pipewrite(a,b,c)	write(a,b,c)
 #else
-/* pgpipe() is in /src/port */
+extern int pgpipe(int handles[2]); /* pgpipe() is in /src/port */
 #define piperead(a,b,c)		recv(a,b,c,0)
 #define pipewrite(a,b,c)	send(a,b,c,0)
 #endif
@@ -322,7 +322,7 @@ pgstat_init(void)
 	/*
 	 * Create the pipe that controls the statistics collector shutdown
 	 */
-	if (pipe(pgStatPmPipe) < 0)
+	if (pgpipe(pgStatPmPipe) < 0)
 	{
 		ereport(LOG,
 				(errcode_for_socket_access(),
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.160 2004/01/09 21:08:46 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.161 2004/01/26 22:51:55 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* Transaction aborts can now occur two ways:`
`@@ -87,7 +87,7 @@`
`87`	`87`	`*`
`88`	`88`	`* Support for transaction blocks is provided via the functions:`
`89`	`89`	`*`
`90`		`- * StartTransactionBlock`
	`90`	`+ * BeginTransactionBlock`
`91`	`91`	`* CommitTransactionBlock`
`92`	`92`	`* AbortTransactionBlock`
`93`	`93`	`*`
`@@ -108,7 +108,7 @@`
`108`	`108`	`*`
`109`	`109`	`* / StartTransactionCommand();`
`110`	`110`	`* 1) / ProcessUtility(); << begin`
`111`		`- * \ StartTransactionBlock();`
	`111`	`+ * \ BeginTransactionBlock();`
`112`	`112`	`* \ CommitTransactionCommand();`
`113`	`113`	`*`
`114`	`114`	`* / StartTransactionCommand();`
`@@ -127,7 +127,7 @@`
`127`	`127`	`* The point of this example is to demonstrate the need for`
`128`	`128`	`* StartTransactionCommand() and CommitTransactionCommand() to`
`129`	`129`	`* be state smart -- they should do nothing in between the calls`
`130`		`- * to StartTransactionBlock() and EndTransactionBlock() and`
	`130`	`+ * to BeginTransactionBlock() and EndTransactionBlock() and`
`131`	`131`	`* outside these calls they need to do normal start/commit`
`132`	`132`	`* processing.`
`133`	`133`	`*`
`@@ -399,7 +399,7 @@ CommandIdIsCurrentCommandId(CommandId cid)`
`399`	`399`	`{`
`400`	`400`	`TransactionState s = CurrentTransactionState;`
`401`	`401`
`402`		`- return (cid == s->commandId) ? true : false;`
	`402`	`+ return (cid == s->commandId);`
`403`	`403`	`}`
`404`	`404`
`405`	`405`
`@@ -860,7 +860,7 @@ StartTransaction(void)`
`860`	`860`	`AtStart_Locks();`
`861`	`861`
`862`	`862`	`/*`
`863`		`- * Tell the trigger manager to we're starting a transaction`
	`863`	`+ * Tell the trigger manager we're starting a transaction`
`864`	`864`	`*/`
`865`	`865`	`DeferredTriggerBeginXact();`
`866`	`866`