From cf5305f4066d827269b27f75af52dc2699d5426f Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sun, 18 Jul 2010 23:43:32 +0000 Subject: [PATCH] Remove unnecessary "Not safe to send CSV data" complaint from elog.c's fallback path when CSV logging is configured but not yet operational. It's sufficient to send the message to stderr, as we were already doing, and the "Not safe" gripe has already confused at least two core members ... Backpatch to 9.0, but not further --- doesn't seem appropriate to change this behavior in stable branches. --- src/backend/utils/error/elog.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index b2fab359b8..93f0ba0e39 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -42,7 +42,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.224 2010/05/08 16:39:51 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.225 2010/07/18 23:43:32 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -2348,15 +2348,13 @@ send_message_to_server_log(ErrorData *edata) } else { - const char *msg = _("Not safe to send CSV data\n"); - - write_console(msg, strlen(msg)); + /* + * syslogger not up (yet), so just dump the message to stderr, + * unless we already did so above. + */ if (!(Log_destination & LOG_DESTINATION_STDERR) && whereToSendOutput != DestDebug) - { - /* write message to stderr unless we just sent it above */ write_console(buf.data, buf.len); - } pfree(buf.data); } }