Fix log_executor_stats for non-multi queries. Backpatch to 7.4.X.

diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index 22cb49f973b2f35ca7ba7f60f1cc7946758b5572..4ff3d8c7ba0dfb76662b1727c586e5e5d800784e 100644 (file)
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.73 2003/09/25 18:58:35 tgl Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.73.2.1 2004/03/05 00:21:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -406,6 +406,17 @@ PortalRun(Portal portal, long count,
        if (completionTag)
                completionTag[0] = '\0';
 
+       if (portal->strategy != PORTAL_MULTI_QUERY)
+       {
+               ereport(DEBUG3,
+                       (errmsg_internal("PortalRun")));
+               /* PORTAL_MULTI_QUERY logs its own stats per query */
+               if (log_executor_stats)
+                       ResetUsage();
+       }
+       
+       if (log_executor_stats && portal->strategy != PORTAL_MULTI_QUERY)
+
        /*
         * Check for improper portal use, and mark portal active.
         */
@@ -500,6 +511,9 @@ PortalRun(Portal portal, long count,
        PortalContext = savePortalContext;
        QueryContext = saveQueryContext;
 
+       if (log_executor_stats && portal->strategy != PORTAL_MULTI_QUERY)
+               ShowUsage("EXECUTOR STATISTICS");
+
        return result;
 }