From 9de4b77cee2999170b1f07a3e8e76e4da2323f3e Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 14 Mar 2001 18:24:34 +0000
Subject: [PATCH] 'waiting' status display had extra space, removed. Change the
 administrator to 'an' administrator.

---
 src/backend/storage/lmgr/lock.c | 4 ++--
 src/backend/tcop/postgres.c     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index 3a27d6b18c..75168800ed 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.85 2001/02/23 20:12:37 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.86 2001/03/14 18:24:32 momjian Exp $
  *
  * NOTES
  *	  Outside modules can create a lock table and acquire/release
@@ -934,7 +934,7 @@ WaitOnLock(LOCKMETHOD lockmethod, LOCKMODE lockmode,
 	old_status = pstrdup(get_ps_display());
 	new_status = (char *) palloc(strlen(old_status) + 10);
 	strcpy(new_status, old_status);
-	strcat(new_status, " waiting");
+	strcat(new_status, "waiting");
 	set_ps_display(new_status);
 
 	/*
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 8e0b32ec2e..2aa08a1c63 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.211 2001/03/14 15:14:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.212 2001/03/14 18:24:34 momjian Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -1034,7 +1034,7 @@ ProcessInterrupts(void)
 		ProcDiePending = false;
 		QueryCancelPending = false;	/* ProcDie trumps QueryCancel */
 		ImmediateInterruptOK = false; /* not idle anymore */
-		elog(FATAL, "This connection has been terminated by the administrator");
+		elog(FATAL, "This connection has been terminated by an administrator");
 	}
 	if (QueryCancelPending)
 	{
@@ -1692,7 +1692,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.211 $ $Date: 2001/03/14 15:14:35 $\n");
+		puts("$Revision: 1.212 $ $Date: 2001/03/14 18:24:34 $\n");
 	}
 
 	/*