Fix a bug induced by the list-rewrite that resulted in incrementing the

Neil Conway · Neil Conway · commit f94197ef35e3 · 2005-02-01T23:28:40.000Z
command counter more than necessary. Per report from Michael Fuhr.
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tcop/pquery.c,v 1.89 2004/12/31 22:01:16 pgsql Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/pquery.c,v 1.90 2005/02/01 23:28:40 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1033,7 +1033,7 @@ PortalRunMulti(Portal portal,
 		 * Increment command counter between queries, but not after the
 		 * last one.
 		 */
-		if (planlist_item != NULL)
+		if (lnext(planlist_item) != NULL)
 			CommandCounterIncrement();
 
 		/*

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/tcop/pquery.c,v 1.89 2004/12/31 22:01:16 pgsql Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/tcop/pquery.c,v 1.90 2005/02/01 23:28:40 neilc Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1033,7 +1033,7 @@ PortalRunMulti(Portal portal,`
`1033`	`1033`	`* Increment command counter between queries, but not after the`
`1034`	`1034`	`* last one.`
`1035`	`1035`	`*/`
`1036`		`- if (planlist_item != NULL)`
	`1036`	`+ if (lnext(planlist_item) != NULL)`
`1037`	`1037`	`CommandCounterIncrement();`
`1038`	`1038`
`1039`	`1039`	`/*`