From 7a32ff97321408afa0ddfcae1a4a060062956d24 Mon Sep 17 00:00:00 2001
From: Robert Haas <rhaas@postgresql.org>
Date: Wed, 12 Jan 2011 11:59:21 -0500
Subject: [PATCH] Revert patch adding support for logging the current role.

This reverts commit a8a8867912c46a68c9ac14903b3dba2fab8f7097, committed
by me earlier today (2011-01-12).  This isn't safe inside an aborted
transaction.

Noted by Tom Lane.
---
 doc/src/sgml/config.sgml       |  7 +------
 src/backend/utils/error/elog.c | 10 ----------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index d014bb5738..8e2a2c5d73 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -3504,12 +3504,7 @@ local0.*    /var/log/postgresql
             </row>
             <row>
              <entry><literal>%u</literal></entry>
-             <entry>Login user name</entry>
-             <entry>yes</entry>
-            </row>
-            <row>
-             <entry><literal>%U</literal></entry>
-             <entry>Current user name</entry>
+             <entry>User name</entry>
              <entry>yes</entry>
             </row>
             <row>
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 49d9236767..a1a449f2dd 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -1826,16 +1826,6 @@ log_line_prefix(StringInfo buf, ErrorData *edata)
 					appendStringInfoString(buf, username);
 				}
 				break;
-			case 'U':
-				if (MyProcPort)
-				{
-					const char *username = GetUserNameFromId(GetUserId());
-
-					if (username == NULL || *username == '\0')
-						username = _("[unknown]");
-					appendStringInfoString(buf, username);
-				}
-				break;
 			case 'd':
 				if (MyProcPort)
 				{