Make logging of extended-protocol commands a bit more consistent, per

discussion with Guillaume Smet.

diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 0344eec53fcf41568d1f716a3065093adea40320..6e83a23293d77a6266d1c03b56dacbd78251ed6c 100644 (file)
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.508 2006/09/08 15:55:53 tgl Exp $
+ *   $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.509 2006/09/13 21:59:04 tgl Exp $
  *
  * NOTES
  *   this is the "main" module of the postgres backend and
@@ -1610,10 +1610,11 @@ exec_bind_message(StringInfo input_message)
            break;
        case 2:
            ereport(LOG,
-                   (errmsg("duration: %s ms  bind %s to %s: %s",
+                   (errmsg("duration: %s ms  bind %s%s%s: %s",
                            msec_str,
-                           *portal_name ? portal_name : "",
                            *stmt_name ? stmt_name : "",
+                           *portal_name ? "/" : "",
+                           *portal_name ? portal_name : "",
                            pstmt->query_string ? pstmt->query_string : ""),
                     errdetail_params(params)));
            break;
@@ -1740,8 +1741,8 @@ exec_execute_message(const char *portal_name, long max_rows)
        ereport(LOG,
                (errmsg("%s %s%s%s%s%s",
                        execute_is_fetch ?
-                       _("statement: execute fetch from") :
-                       _("statement: execute"),
+                       _("execute fetch from") :
+                       _("execute"),
                        prepStmtName,
                        *portal_name ? "/" : "",
                        *portal_name ? portal_name : "",