diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index 7daa5974bd3e11f0e8e6aa54f54036f7c377ad66..77d878591d208dbac18ef63eb1ba14560246576f 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.38 1999/07/19 07:07:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.39 1999/10/23 03:13:20 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -44,10 +44,10 @@ index_formtuple(TupleDesc tupleDescriptor,
 	uint16		tupmask = 0;
 	int			numberOfAttributes = tupleDescriptor->natts;
 
-	if (numberOfAttributes > MaxIndexAttributeNumber)
-		elog(ERROR, "index_formtuple: numberOfAttributes of %d > %d",
-			 numberOfAttributes, MaxIndexAttributeNumber);
-
+	/* XXX shouldn't this test be '>' ? */
+	if (numberOfAttributes >= INDEX_MAX_KEYS)
+		elog(ERROR, "index_formtuple: numberOfAttributes %d >= %d",
+			 numberOfAttributes, INDEX_MAX_KEYS);
 
 	for (i = 0; i < numberOfAttributes && !hasnull; i++)
 	{
diff --git a/src/backend/access/index/istrat.c b/src/backend/access/index/istrat.c
index cab6e5846091fb20434b094f37d5b8342a225d27..77918725e13702ea2c18e34fe66e320157a7758e 100644
--- a/src/backend/access/index/istrat.c
+++ b/src/backend/access/index/istrat.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.36 1999/09/18 19:06:04 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.37 1999/10/23 03:13:20 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -544,7 +544,7 @@ IndexSupportInitialize(IndexStrategy indexStrategy,
 	StrategyMap map;
 	AttrNumber	attributeNumber;
 	int			attributeIndex;
-	Oid			operatorClassObjectId[MaxIndexAttributeNumber];
+	Oid			operatorClassObjectId[INDEX_MAX_KEYS];
 
 	if (!IsBootstrapProcessingMode())
 	{
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 97d21cb68bc25537eb4ac35c59bdcfe273e71abc..8c45e6231f80b3d00d9b68510b7cd5f836ca36b6 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.41 1999/09/27 03:12:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.42 1999/10/23 03:13:21 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -96,23 +96,25 @@ pg_krb4_recvauth(Port *port)
 						  version);
 	if (status != KSUCCESS)
 	{
-		snprintf(PQerrormsg, ERROR_MSG_LENGTH,
-		  "pg_krb4_recvauth: kerberos error: %s\n", krb_err_txt[status]);
+		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
+				 "pg_krb4_recvauth: kerberos error: %s\n",
+				 krb_err_txt[status]);
 		fputs(PQerrormsg, stderr);
 		pqdebug("%s", PQerrormsg);
 		return STATUS_ERROR;
 	}
 	if (strncmp(version, PG_KRB4_VERSION, KRB_SENDAUTH_VLEN))
 	{
-		snprintf(PQerrormsg, ERROR_MSG_LENGTH,
-				 "pg_krb4_recvauth: protocol version != \"%s\"\n", PG_KRB4_VERSION);
+		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
+				 "pg_krb4_recvauth: protocol version != \"%s\"\n",
+				 PG_KRB4_VERSION);
 		fputs(PQerrormsg, stderr);
 		pqdebug("%s", PQerrormsg);
 		return STATUS_ERROR;
 	}
 	if (strncmp(port->user, auth_data.pname, SM_USER))
 	{
-		snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 				 "pg_krb4_recvauth: name \"%s\" != \"%s\"\n",
 				 port->user, auth_data.pname);
 		fputs(PQerrormsg, stderr);
@@ -126,8 +128,8 @@ pg_krb4_recvauth(Port *port)
 static int
 pg_krb4_recvauth(Port *port)
 {
-	snprintf(PQerrormsg, ERROR_MSG_LENGTH,
-		 "pg_krb4_recvauth: Kerberos not implemented on this server.\n");
+	snprintf(PQerrormsg, PQERRORMSG_LENGTH,
+			 "pg_krb4_recvauth: Kerberos not implemented on this server.\n");
 	fputs(PQerrormsg, stderr);
 	pqdebug("%s", PQerrormsg);
 
@@ -220,7 +222,7 @@ pg_krb5_recvauth(Port *port)
 		*hostp = '\0';
 	if (code = krb5_parse_name(servbuf, &server))
 	{
-		snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 		"pg_krb5_recvauth: Kerberos error %d in krb5_parse_name\n", code);
 		com_err("pg_krb5_recvauth", code, "in krb5_parse_name");
 		return STATUS_ERROR;
@@ -253,7 +255,7 @@ pg_krb5_recvauth(Port *port)
 							 (krb5_ticket **) NULL,
 							 (krb5_authenticator **) NULL))
 	{
-		snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 		 "pg_krb5_recvauth: Kerberos error %d in krb5_recvauth\n", code);
 		com_err("pg_krb5_recvauth", code, "in krb5_recvauth");
 		krb5_free_principal(server);
@@ -268,7 +270,7 @@ pg_krb5_recvauth(Port *port)
 	 */
 	if ((code = krb5_unparse_name(client, &kusername)))
 	{
-		snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 				 "pg_krb5_recvauth: Kerberos error %d in krb5_unparse_name\n", code);
 		com_err("pg_krb5_recvauth", code, "in krb5_unparse_name");
 		krb5_free_principal(client);
@@ -277,7 +279,7 @@ pg_krb5_recvauth(Port *port)
 	krb5_free_principal(client);
 	if (!kusername)
 	{
-		snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 				 "pg_krb5_recvauth: could not decode username\n");
 		fputs(PQerrormsg, stderr);
 		pqdebug("%s", PQerrormsg);
@@ -286,7 +288,7 @@ pg_krb5_recvauth(Port *port)
 	kusername = pg_an_to_ln(kusername);
 	if (strncmp(username, kusername, SM_USER))
 	{
-		snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 				 "pg_krb5_recvauth: name \"%s\" != \"%s\"\n", port->user, kusername);
 		fputs(PQerrormsg, stderr);
 		pqdebug("%s", PQerrormsg);
@@ -301,7 +303,7 @@ pg_krb5_recvauth(Port *port)
 static int
 pg_krb5_recvauth(Port *port)
 {
-	snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+	snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 		 "pg_krb5_recvauth: Kerberos not implemented on this server.\n");
 	fputs(PQerrormsg, stderr);
 	pqdebug("%s", PQerrormsg);
@@ -356,7 +358,7 @@ pg_passwordv0_recvauth(void *arg, PacketLen len, void *pkt)
 
 	if (user == NULL || password == NULL)
 	{
-		snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 				 "pg_password_recvauth: badly formed password packet.\n");
 		fputs(PQerrormsg, stderr);
 		pqdebug("%s", PQerrormsg);
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 1429156032291b714e979656374022e184689e94..194119922aeb88d611cdcde49e564b4239478b1d 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -5,7 +5,7 @@
  *	  wherein you authenticate a user by seeing what IP address the system
  *	  says he comes from and possibly using ident).
  *
- *	$Id: hba.c,v 1.48 1999/09/27 03:12:59 momjian Exp $
+ *	$Id: hba.c,v 1.49 1999/10/23 03:13:21 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,9 +19,18 @@
 #include <unistd.h>
 
 #include "postgres.h"
+
 #include "libpq/libpq.h"
 #include "miscadmin.h"
 
+
+#define MAX_TOKEN 80
+/* Maximum size of one token in the configuration file	*/
+
+#define IDENT_USERNAME_MAX 512
+ /* Max size of username ident server can return */
+
+
 /* Some standard C libraries, including GNU, have an isblank() function.
    Others, including Solaris, do not.  So we have our own.
 */
@@ -32,7 +41,6 @@ isblank(const char c)
 }
 
 
-
 static void
 next_token(FILE *fp, char *buf, const int bufsz)
 {
@@ -302,9 +310,8 @@ process_hba_record(FILE *file, hbaPort *port, bool *matches_p, bool *error_p)
 	return;
 
 syntax:
-	snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+	snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 			 "process_hba_record: invalid syntax in pg_hba.conf file\n");
-
 	fputs(PQerrormsg, stderr);
 	pqdebug("%s", PQerrormsg);
 
@@ -397,7 +404,7 @@ find_hba_entry(hbaPort *port, bool *hba_ok_p)
 	{
 		/* Old config file exists.	Tell this guy he needs to upgrade. */
 		close(fd);
-		snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 		  "A file exists by the name used for host-based authentication "
 		   "in prior releases of Postgres (%s).  The name and format of "
 		   "the configuration file have changed, so this file should be "
@@ -421,7 +428,7 @@ find_hba_entry(hbaPort *port, bool *hba_ok_p)
 		{
 			/* The open of the config file failed.	*/
 
-			snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+			snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 				 "find_hba_entry: Host-based authentication config file "
 				"does not exist or permissions are not setup correctly! "
 					 "Unable to open file \"%s\".\n",
@@ -553,7 +560,7 @@ ident(const struct in_addr remote_ip_addr, const struct in_addr local_ip_addr,
 	sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
 	if (sock_fd == -1)
 	{
-		snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 			 "Failed to create socket on which to talk to Ident server. "
 				 "socket() returned errno = %s (%d)\n",
 				 strerror(errno), errno);
@@ -590,7 +597,7 @@ ident(const struct in_addr remote_ip_addr, const struct in_addr local_ip_addr,
 		}
 		if (rc != 0)
 		{
-			snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+			snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 				"Unable to connect to Ident server on the host which is "
 					 "trying to connect to Postgres "
 					 "(IP address %s, Port %d). "
@@ -610,7 +617,7 @@ ident(const struct in_addr remote_ip_addr, const struct in_addr local_ip_addr,
 			rc = send(sock_fd, ident_query, strlen(ident_query), 0);
 			if (rc < 0)
 			{
-				snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+				snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 						 "Unable to send query to Ident server on the host which is "
 					  "trying to connect to Postgres (Host %s, Port %d),"
 						 "even though we successfully connected to it.  "
@@ -627,7 +634,7 @@ ident(const struct in_addr remote_ip_addr, const struct in_addr local_ip_addr,
 				rc = recv(sock_fd, ident_response, sizeof(ident_response) - 1, 0);
 				if (rc < 0)
 				{
-					snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+					snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 						  "Unable to receive response from Ident server "
 							 "on the host which is "
 					  "trying to connect to Postgres (Host %s, Port %d),"
@@ -692,7 +699,7 @@ parse_map_record(FILE *file,
 				return;
 			}
 		}
-		snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 				 "Incomplete line in pg_ident: %s", file_map);
 		fputs(PQerrormsg, stderr);
 		pqdebug("%s", PQerrormsg);
@@ -775,7 +782,7 @@ verify_against_usermap(const char *pguser,
 	if (usermap_name[0] == '\0')
 	{
 		*checks_out_p = false;
-		snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 			   "verify_against_usermap: hba configuration file does not "
 		   "have the usermap field filled in in the entry that pertains "
 		  "to this connection.  That field is essential for Ident-based "
@@ -813,7 +820,7 @@ verify_against_usermap(const char *pguser,
 
 			*checks_out_p = false;
 
-			snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+			snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 				  "verify_against_usermap: usermap file for Ident-based "
 					 "authentication "
 				"does not exist or permissions are not setup correctly! "
diff --git a/src/backend/libpq/password.c b/src/backend/libpq/password.c
index 3e3b8401e15c98b942c3468716256a2c6f2831b4..3722d2bd7f5aec444b932d76fe009843a185e157 100644
--- a/src/backend/libpq/password.c
+++ b/src/backend/libpq/password.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: password.c,v 1.25 1999/07/17 20:17:02 momjian Exp $
+ * $Id: password.c,v 1.26 1999/10/23 03:13:21 tgl Exp $
  *
  */
 
@@ -34,7 +34,7 @@ verify_password(char *auth_arg, char *user, char *password)
 #endif
 	if (!pw_file)
 	{
-		snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 				 "verify_password: couldn't open password file '%s'\n",
 				 pw_file_fullname);
 		fputs(PQerrormsg, stderr);
@@ -79,7 +79,7 @@ verify_password(char *auth_arg, char *user, char *password)
 				return STATUS_OK;
 			}
 
-			snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+			snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 					 "verify_password: password mismatch for '%s'.\n",
 					 user);
 			fputs(PQerrormsg, stderr);
@@ -91,7 +91,7 @@ verify_password(char *auth_arg, char *user, char *password)
 		}
 	}
 
-	snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+	snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 			 "verify_password: user '%s' not found in password file.\n",
 			 user);
 	fputs(PQerrormsg, stderr);
diff --git a/src/backend/libpq/portal.c b/src/backend/libpq/portal.c
index abc69686e6de115030fa0d0887cd0a419b065e5e..754e283fabe5d15e8f18654920d6ad0d4961ede7 100644
--- a/src/backend/libpq/portal.c
+++ b/src/backend/libpq/portal.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: portal.c,v 1.27 1999/07/17 20:17:02 momjian Exp $
+ *	$Id: portal.c,v 1.28 1999/10/23 03:13:22 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -66,7 +66,7 @@ in_range(char *msg, int value, int min, int max)
 {
 	if (value < min || value >= max)
 	{
-		snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 		"FATAL: %s, %d is not in range [%d,%d)\n", msg, value, min, max);
 		pqdebug("%s", PQerrormsg);
 		fputs(PQerrormsg, stderr);
@@ -80,7 +80,7 @@ valid_pointer(char *msg, void *ptr)
 {
 	if (!ptr)
 	{
-		snprintf(PQerrormsg, ERROR_MSG_LENGTH, "FATAL: %s\n", msg);
+		snprintf(PQerrormsg, PQERRORMSG_LENGTH, "FATAL: %s\n", msg);
 		pqdebug("%s", PQerrormsg);
 		fputs(PQerrormsg, stderr);
 		return 0;
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 38ddcd28d3fc65898e79c97669fa7c14d08e72f3..7fc86d4ede30209e7d3c8d60cdca48a6c6cd509b 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -28,7 +28,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: pqcomm.c,v 1.84 1999/09/27 03:12:59 momjian Exp $
+ *	$Id: pqcomm.c,v 1.85 1999/10/23 03:13:22 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -195,7 +195,7 @@ StreamServerPort(char *hostName, unsigned short portName, int *fdP)
 
 	if ((fd = socket(family, SOCK_STREAM, 0)) < 0)
 	{
-		snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 				 "FATAL: StreamServerPort: socket() failed: %s\n",
 				 strerror(errno));
 		fputs(PQerrormsg, stderr);
@@ -211,7 +211,7 @@ StreamServerPort(char *hostName, unsigned short portName, int *fdP)
 		if ((setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *) &one,
 						sizeof(one))) == -1)
 		{
-			snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+			snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 					 "FATAL: StreamServerPort: setsockopt(SO_REUSEADDR) failed: %s\n",
 					 strerror(errno));
 			fputs(PQerrormsg, stderr);
@@ -266,20 +266,19 @@ StreamServerPort(char *hostName, unsigned short portName, int *fdP)
 	err = bind(fd, &saddr.sa, len);
 	if (err < 0)
 	{
-		snprintf(PQerrormsg, ERROR_MSG_LENGTH,
-				 "FATAL: StreamServerPort: bind() failed: %s\n",
+		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
+				 "FATAL: StreamServerPort: bind() failed: %s\n"
+				 "\tIs another postmaster already running on that port?\n",
 				 strerror(errno));
-		strcat(PQerrormsg,
-			   "\tIs another postmaster already running on that port?\n");
 		if (family == AF_UNIX)
-		{
 			snprintf(PQerrormsg + strlen(PQerrormsg),
-					 ERROR_MSG_LENGTH - strlen(PQerrormsg),
+					 PQERRORMSG_LENGTH - strlen(PQerrormsg),
 					 "\tIf not, remove socket node (%s) and retry.\n",
 					 sock_path);
-		}
 		else
-			strcat(PQerrormsg, "\tIf not, wait a few seconds and retry.\n");
+			snprintf(PQerrormsg + strlen(PQerrormsg),
+					 PQERRORMSG_LENGTH - strlen(PQerrormsg),
+					 "\tIf not, wait a few seconds and retry.\n");
 		fputs(PQerrormsg, stderr);
 		pqdebug("%s", PQerrormsg);
 		return STATUS_ERROR;
diff --git a/src/backend/libpq/pqformat.c b/src/backend/libpq/pqformat.c
index 098c41dc52597e9c1c62a7aa743ce7db6c2cb768..28f6d48db35934f84a2f0d948a159ed0b7e2ce64 100644
--- a/src/backend/libpq/pqformat.c
+++ b/src/backend/libpq/pqformat.c
@@ -15,7 +15,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: pqformat.c,v 1.10 1999/09/12 22:27:47 scrappy Exp $
+ *	$Id: pqformat.c,v 1.11 1999/10/23 03:13:22 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -213,7 +213,7 @@ pq_endmessage(StringInfo buf)
 {
 	if (pq_putmessage('\0', buf->data, buf->len))
 	{
-		snprintf(PQerrormsg, ERROR_MSG_LENGTH,
+		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 				 "FATAL: pq_endmessage failed: errno=%d\n", errno);
 		fputs(PQerrormsg, stderr);
 		pqdebug("%s", PQerrormsg);
diff --git a/src/backend/libpq/util.c b/src/backend/libpq/util.c
index c331298dbd54ab1242dd6e96f71a3dfd11415905..755554fb0d99793debec8a3e022705132368701a 100644
--- a/src/backend/libpq/util.c
+++ b/src/backend/libpq/util.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: util.c,v 1.13 1999/07/17 20:17:03 momjian Exp $
+ *	$Id: util.c,v 1.14 1999/10/23 03:13:22 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,6 +22,15 @@
 #include "libpq/libpq.h"
 
 
+/* ----------------
+ *		global variables for backend libpq
+ * ----------------
+ */
+char		PQerrormsg[PQERRORMSG_LENGTH];
+
+int			PQtracep = 0;		/* 1 to print out debugging messages */
+FILE	   *debug_port = (FILE *) NULL;
+
 /* ----------------
  *		exceptions
  * ----------------
@@ -30,15 +39,12 @@ Exception	MemoryError = {"Memory Allocation Error"};
 Exception	PortalError = {"Invalid arguments to portal functions"};
 Exception	PostquelError = {"Sql Error"};
 Exception	ProtocolError = {"Protocol Error"};
-char		PQerrormsg[ERROR_MSG_LENGTH];
-
-int			PQtracep = 0;		/* 1 to print out debugging messages */
-FILE	   *debug_port = (FILE *) NULL;
 
 /* ----------------------------------------------------------------
  *						PQ utility routines
  * ----------------------------------------------------------------
  */
+
 void
 pqdebug(char *target, char *msg)
 {
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 8358e116980ffae33f498d53cab82ca7409c20b3..ddf6c280e4fb0ed53c7c26691a593ca86c2cd281 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.134 1999/10/08 05:36:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.135 1999/10/23 03:13:22 tgl Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -22,16 +22,10 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <fcntl.h>
-#include <sys/param.h>
+#include <sys/socket.h>
 
 #include "postgres.h"
 
-#ifndef MAXHOSTNAMELEN
-#include <netdb.h>
-#endif
-#ifndef MAXHOSTNAMELEN			/* for MAXHOSTNAMELEN under sco3.2v5.0.2 */
-#include <sys/socket.h>
-#endif
 #include <errno.h>
 #if HAVE_SYS_SELECT_H
 #include <sys/select.h>
@@ -1500,7 +1494,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.134 $ $Date: 1999/10/08 05:36:58 $\n");
+		puts("$Revision: 1.135 $ $Date: 1999/10/23 03:13:22 $\n");
 	}
 
 	/*
diff --git a/src/backend/utils/mmgr/palloc.c b/src/backend/utils/mmgr/palloc.c
index 5b2cc419e84a73cfef5c0d7374b1f54bf4f36e69..afc52b4b5b4e50ff795c2228568809e4bb8edc4d 100644
--- a/src/backend/utils/mmgr/palloc.c
+++ b/src/backend/utils/mmgr/palloc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/palloc.c,v 1.14 1999/07/17 20:18:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/palloc.c,v 1.15 1999/10/23 03:13:24 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,7 +35,7 @@ pstrdup(char *string)
 	int			len;
 
 	nstr = palloc(len = strlen(string) + 1);
-	MemoryCopy(nstr, string, len);
+	memcpy(nstr, string, len);
 
 	return nstr;
 }
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index 73aae724a3d056e9ade3d0400defa06aeeec93f9..d600ba582153a128f9556d4ce55611149d75ed14 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.33 1999/07/17 20:18:18 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.34 1999/10/23 03:13:26 tgl Exp $
  *
  * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
  *
@@ -20,12 +20,9 @@
 
 
 #include <ctype.h>
-#include <sys/param.h>			/* for MAXHOSTNAMELEN on most */
-#ifdef solaris_sparc
-#include <netdb.h>				/* for MAXHOSTNAMELEN on some */
-#endif
 
 #include "postgres.h"
+
 #include "libpq-fe.h"
 #ifndef HAVE_STRDUP
 #include "strdup.h"
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index c3eb2ea96d49fb319217cf0139daf7e26ec37c08..6a8602dfa61039effc55ca604c4b3c59cc29aa1d 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -21,7 +21,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.122 1999/10/10 17:00:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.123 1999/10/23 03:13:26 tgl Exp $
  *
  * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
  *
@@ -53,32 +53,28 @@
 
 #include <unistd.h>				/* for getopt() */
 #include <ctype.h>
-#include <sys/param.h>			/* for MAXHOSTNAMELEN on most */
-#ifdef solaris_sparc
-#include <netdb.h>				/* for MAXHOSTNAMELEN on some */
-#endif
 
 #include "postgres.h"
+
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#endif
+#ifdef HAVE_TERMIOS_H
+#include <termios.h>
+#endif
+
+#include "access/attnum.h"
 #include "access/htup.h"
-#include "catalog/pg_type.h"
-#include "catalog/pg_language.h"
 #include "catalog/pg_index.h"
+#include "catalog/pg_language.h"
 #include "catalog/pg_trigger.h"
-#include "access/attnum.h"
+#include "catalog/pg_type.h"
 
 #include "libpq-fe.h"
 #ifndef HAVE_STRDUP
 #include "strdup.h"
 #endif
 
-#ifdef HAVE_TERMIOS_H
-#include <termios.h>
-#endif
-
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
-
 #include "pg_dump.h"
 
 static void dumpSequence(FILE *fout, TableInfo tbinfo);
diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h
index fc2aab94d5e44df78e2dc8a8b1e1f3acd2975028..9ef43b3713d69bcd8634c3cab9745418c589af9a 100644
--- a/src/bin/pg_dump/pg_dump.h
+++ b/src/bin/pg_dump/pg_dump.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_dump.h,v 1.39 1999/05/26 21:51:11 tgl Exp $
+ * $Id: pg_dump.h,v 1.40 1999/10/23 03:13:26 tgl Exp $
  *
  * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
  *
@@ -19,7 +19,16 @@
  *-------------------------------------------------------------------------
  */
 
-#include <catalog/pg_index.h>
+#ifndef PG_DUMP_H
+#define PG_DUMP_H
+
+#include "catalog/pg_index.h"
+
+/*
+ * Very temporary hack --- remove this when all pg_dump's uses of it are gone!
+ */
+#define MAX_QUERY_SIZE	(BLCKSZ*2)
+
 
 /* The *Info data structures run-time C structures used to store
    system catalog information */
@@ -225,3 +234,5 @@ extern void dumpTables(FILE *fout, TableInfo *tbinfo, int numTables,
 extern void dumpIndices(FILE *fout, IndInfo *indinfo, int numIndices,
 			TableInfo *tbinfo, int numTables, const char *tablename);
 extern const char *fmtId(const char *identifier, bool force_quotes);
+
+#endif /* PG_DUMP_H */
diff --git a/src/include/access/ibit.h b/src/include/access/ibit.h
index 31ccc99191bc889bb3b77a382076c4f71e818a83..0adb3167ee84c6d1ae19c4ee702732870459d96d 100644
--- a/src/include/access/ibit.h
+++ b/src/include/access/ibit.h
@@ -6,19 +6,18 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: ibit.h,v 1.10 1999/07/15 23:03:34 momjian Exp $
+ * $Id: ibit.h,v 1.11 1999/10/23 03:13:27 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef IBIT_H
 #define IBIT_H
 
-#include "utils/memutils.h"
+#include "catalog/pg_index.h"
 
 typedef struct IndexAttributeBitMapData
 {
-	char		bits[(MaxIndexAttributeNumber + MaxBitsPerByte - 1)
-					 /			 MaxBitsPerByte];
+	bits8		bits[(INDEX_MAX_KEYS + 8 - 1)/8];
 } IndexAttributeBitMapData;
 
 typedef IndexAttributeBitMapData *IndexAttributeBitMap;
diff --git a/src/include/access/itup.h b/src/include/access/itup.h
index 3294d1948a3c4286595e758eb146ea7cd649bc06..30865a8e02e54ec342d989e3746b1e354877c972 100644
--- a/src/include/access/itup.h
+++ b/src/include/access/itup.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: itup.h,v 1.21 1999/07/19 07:07:28 momjian Exp $
+ * $Id: itup.h,v 1.22 1999/10/23 03:13:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,6 @@
 #include "access/tupmacs.h"
 #include "storage/itemptr.h"
 
-#define MaxIndexAttributeNumber 7
 
 typedef struct IndexTupleData
 {
diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h
index d1dc7ec121f13cf2778c00a549ec3fdc15b3928d..5dcf49100d530bf0d8ebe44fa0eb331d841a86e0 100644
--- a/src/include/libpq/hba.h
+++ b/src/include/libpq/hba.h
@@ -4,7 +4,7 @@
  *	  Interface to hba.c
  *
  *
- * $Id: hba.h,v 1.15 1999/09/27 03:13:10 momjian Exp $
+ * $Id: hba.h,v 1.16 1999/10/23 03:13:29 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,19 +24,10 @@
 #define OLD_CONF_FILE "pg_hba"
  /* Name of the config file in prior releases of Postgres. */
 
-#define MAX_LINES 255
- /* Maximum number of config lines that can apply to one database	 */
-
-#define MAX_TOKEN 80
-/* Maximum size of one token in the configuration file	*/
-
-#define MAX_AUTH_ARG	80		/* Max size of an authentication arg */
-
 #define IDENT_PORT 113
  /* Standard TCP port number for Ident service.  Assigned by IANA */
 
-#define IDENT_USERNAME_MAX 512
- /* Max size of username ident server can return */
+#define MAX_AUTH_ARG	80		/* Max size of an authentication arg */
 
 typedef enum UserAuth
 {
diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h
index 463c5564b413a36c3275768ff47a2d9e6f7c0845..07d6d3ef31bbc1bef38a9f46ed8365e1e208a881 100644
--- a/src/include/libpq/libpq.h
+++ b/src/include/libpq/libpq.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq.h,v 1.33 1999/08/31 04:26:33 tgl Exp $
+ * $Id: libpq.h,v 1.34 1999/10/23 03:13:29 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -135,15 +135,15 @@ extern Exception MemoryError,
 			ProtocolError;
 
 /*
- * POSTGRES backend dependent Constants.
+ * PQerrormsg[] is used only for error messages generated within backend
+ * libpq, none of which are remarkably long.  Note that this length should
+ * NOT be taken as any indication of the maximum error message length that
+ * the backend can create!  elog() can in fact produce extremely long messages.
  */
 
-/* ERROR_MSG_LENGTH should really be the same as ELOG_MAXLEN in utils/elog.h*/
-#define ERROR_MSG_LENGTH 4096
-#define COMMAND_LENGTH 20
-#define REMARK_LENGTH 80
+#define PQERRORMSG_LENGTH 1024
 
-extern char PQerrormsg[ERROR_MSG_LENGTH];		/* in portal.c */
+extern char PQerrormsg[PQERRORMSG_LENGTH];		/* in libpq/util.c */
 
 /*
  * External functions.
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 7b23a98bf9f69c4690d7b1f4427aa03b4931e170..a26024f72477743f6e647c3cd7385e71e66fcba6 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -11,7 +11,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: miscadmin.h,v 1.44 1999/10/08 04:28:52 momjian Exp $
+ * $Id: miscadmin.h,v 1.45 1999/10/23 03:13:30 tgl Exp $
  *
  * NOTES
  *	  some of the information in this file will be moved to
@@ -101,9 +101,6 @@ extern int	SortMem;
 
 extern Oid	LastOidProcessed;	/* for query rewrite */
 
-/* #define MAX_QUERY_SIZE	 (BLCKSZ*2) */
-#define MAX_PARSE_BUFFER MAX_QUERY_SIZE
-
 /*****************************************************************************
  *	  pdir.h --																 *
  *			POSTGRES directory path definitions.							 *
diff --git a/src/include/postgres.h b/src/include/postgres.h
index ad6cda6795244bba9dfcebf5120f31cd88df0284..5835f4448661280145dcf84cce791e03332d8afb 100644
--- a/src/include/postgres.h
+++ b/src/include/postgres.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1995, Regents of the University of California
  *
- * $Id: postgres.h,v 1.26 1999/07/17 04:12:10 momjian Exp $
+ * $Id: postgres.h,v 1.27 1999/10/23 03:13:30 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -54,7 +54,7 @@ typedef double float8;
 typedef int4 aclitem;
 
 #define InvalidOid		0
-#define OidIsValid(objectId)  ((bool) (objectId != InvalidOid))
+#define OidIsValid(objectId)  ((bool) ((objectId) != InvalidOid))
 
 /* unfortunately, both regproc and RegProcedure are used */
 typedef Oid regproc;
@@ -147,7 +147,7 @@ typedef uint32 CommandId;
 
 /* ----------------------------------------------------------------
  *				Section 5:	random stuff
- *							CSIGNBIT, MAXPGPATH, STATUS...
+ *							CSIGNBIT, STATUS...
  * ----------------------------------------------------------------
  */
 
@@ -158,12 +158,8 @@ typedef uint32 CommandId;
 /* msb for char */
 #define CSIGNBIT (0x80)
 
-/* ----------------
- *		global variables which should probably go someplace else.
- * ----------------
- */
+/* this should probably be somewhere else */
 #define MAXPGPATH		128
-#define MAX_QUERY_SIZE	(BLCKSZ*2)
 
 #define STATUS_OK				(0)
 #define STATUS_ERROR			(-1)
@@ -180,8 +176,7 @@ typedef uint32 CommandId;
  * ---------------
  */
 #ifdef CYR_RECODE
-void		SetCharSet();
-
+extern void		SetCharSet();
 #endif	 /* CYR_RECODE */
 
 #endif	 /* POSTGRES_H */
diff --git a/src/include/tcop/fastpath.h b/src/include/tcop/fastpath.h
index 09d111102fc5a980e2d3c476f9a4ccaf4b3bd7b7..8d7de65de09880dbb420069fad97a8afa21c0c9a 100644
--- a/src/include/tcop/fastpath.h
+++ b/src/include/tcop/fastpath.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fastpath.h,v 1.5 1999/02/13 23:22:12 momjian Exp $
+ * $Id: fastpath.h,v 1.6 1999/10/23 03:13:32 tgl Exp $
  *
  * NOTES
  *	  This information pulled out of tcop/fastpath.c and put
@@ -24,7 +24,6 @@
  */
 #define VAR_LENGTH_RESULT		(-1)
 #define VAR_LENGTH_ARG			(-5)
-#define MAX_STRING_LENGTH		256
 
 extern int	HandleFunctionRequest(void);
 
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index cac5facc313da49c564207bf22be67211c75e611..9c59ff2d9f3cf52ff02f7001d24e61ff1ac31ac5 100644
--- a/src/include/utils/memutils.h
+++ b/src/include/utils/memutils.h
@@ -8,29 +8,17 @@
  *		align.h							alignment macros
  *		aset.h							memory allocation set stuff
  *		oset.h							  (used by aset.h)
- *		(bit.h							bit array type / extern)
- *		clib.h							mem routines
- *		limit.h							max bits/byte, etc.
  *
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: memutils.h,v 1.31 1999/08/24 20:11:19 tgl Exp $
- *
- * NOTES
- *	  some of the information in this file will be moved to
- *	  other files, (like MaxHeapTupleSize and MaxAttributeSize).
+ * $Id: memutils.h,v 1.32 1999/10/23 03:13:33 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef MEMUTILS_H
 #define MEMUTILS_H
 
-/*
- *	This is not needed by this include file, but by almost every file
- *	that includes this file.
- */
-
 /* ----------------
  * Alignment macros: align a length or address appropriately for a given type.
  *
@@ -236,40 +224,5 @@ extern AllocPointer AllocSetRealloc(AllocSet set, AllocPointer pointer,
 
 extern void AllocSetDump(AllocSet set);
 
-/*****************************************************************************
- *	  clib.h --			Standard C library definitions						 *
- *****************************************************************************/
-/*
- * Note:
- *		This file is OPERATING SYSTEM dependent!!!
- *
- */
-
-/*
- *		LibCCopyLength is only used within this file. -cim 6/12/90
- *
- */
-typedef int LibCCopyLength;
-
-/*
- * MemoryCopy
- *		Copies fixed length block of memory to another.
- */
-#define MemoryCopy(toBuffer, fromBuffer, length)\
-	memcpy(toBuffer, fromBuffer, length)
-
-/*****************************************************************************
- *	  limit.h --		POSTGRES limit definitions.							 *
- *****************************************************************************/
-
-#define MaxBitsPerByte	8
-
-typedef uint32 AttributeSize;	/* XXX should be defined elsewhere */
-
-#define MaxHeapTupleSize		0x7fffffff
-#define MaxAttributeSize		0x7fffffff
-
-#define MaxIndexAttributeNumber 7
-
 
 #endif	 /* MEMUTILS_H */