2 files changed, 16 insertions, 24 deletions

diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index e2ffb7bc82..2a41d3b57f 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.86 2001/06/08 21:16:48 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.87 2001/06/20 18:07:56 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -129,10 +129,6 @@ elog(int lev, const char *fmt,...)
 	/* size of the prefix needed for timestamp and pid, if enabled */
 	size_t		timestamp_size;
 
-	/* ignore debug msgs if noplace to send */
-	if (lev == DEBUG && Debugfile < 0)
-		return;
-
 	/* Save error str before calling any function that might change errno */
 	errorstr = useful_strerror(errno);
 
@@ -336,10 +332,9 @@ elog(int lev, const char *fmt,...)
 	/* syslog doesn't want a trailing newline, but other destinations do */
 	strcat(msg_buf, "\n");
 
-	/* Write to debug file, if open and enabled */
-	/* NOTE: debug file is typically pointed at stderr */
-	if (Debugfile >= 0 && Use_syslog <= 1)
-		write(Debugfile, msg_buf, strlen(msg_buf));
+	/* write to terminal */
+	if (Use_syslog <= 1 || whereToSendOutput == Debug)
+		write(2, msg_buf, strlen(msg_buf));
 
 	if (lev > DEBUG && whereToSendOutput == Remote)
 	{
@@ -371,17 +366,6 @@ elog(int lev, const char *fmt,...)
 		MemoryContextSwitchTo(oldcxt);
 	}
 
-	if (lev > DEBUG && whereToSendOutput != Remote)
-	{
-		/*
-		 * We are running as an interactive backend, so just send the
-		 * message to stderr.  But don't send a duplicate if Debugfile
-		 * write, above, already sent to stderr.
-		 */
-		if (Debugfile != fileno(stderr))
-			fputs(msg_buf, stderr);
-	}
-
 	/* done with the message, release space */
 	if (fmt_buf != fmt_fixedbuf)
 		free(fmt_buf);
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index df46469f00..4f2b940b7e 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.71 2001/06/14 01:09:22 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.72 2001/06/20 18:07:56 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,6 +28,7 @@
 
 #include "catalog/catname.h"
 #include "catalog/pg_shadow.h"
+#include "libpq/libpq-be.h"
 #include "miscadmin.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
@@ -279,6 +280,7 @@ SetCharSet()
 	int			i;
 	unsigned char FromChar,
 				ToChar;
+	char		ChTable[80];
 
 	for (i = 0; i < 128; i++)
 	{
@@ -286,11 +288,17 @@ SetCharSet()
 		RecodeBackTable[i] = i + 128;
 	}
 
-	p = getenv("PG_RECODETABLE");
+	if (IsUnderPostmaster)
+	{
+		GetCharSetByHost(ChTable, MyProcPort->raddr.in.sin_addr.s_addr, DataDir);
+		p = ChTable;
+	}
+	else
+		p = getenv("PG_RECODETABLE");
+
 	if (p && *p != '\0')
 	{
-		map_file = (char *) malloc((strlen(DataDir) +
-									strlen(p) + 2) * sizeof(char));
+		map_file = malloc(strlen(DataDir) +	strlen(p) + 2);
 		if (! map_file)
 			elog(FATAL, "out of memory");
 		sprintf(map_file, "%s/%s", DataDir, p);