From: David Rowley <drowley@postgresql.org>
Date: Sun, 22 Aug 2021 13:44:20 +0000 (+1200)
Subject: Fix broken regression test caused by 22c4e88eb
X-Git-Tag: REL_15_BETA1~1640
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=945f395aeb74cea77d5239db01357bbcbea80534;p=thirdparty%2Fpostgresql.git

Fix broken regression test caused by 22c4e88eb

Per buildfarm members hoverfly and thorntail
---

diff --git a/src/test/regress/expected/select_distinct.out b/src/test/regress/expected/select_distinct.out
index 0c8e10f88a5..58122c6f887 100644
--- a/src/test/regress/expected/select_distinct.out
+++ b/src/test/regress/expected/select_distinct.out
@@ -214,6 +214,7 @@ DROP TABLE distinct_group_2;
 SET parallel_tuple_cost=0;
 SET parallel_setup_cost=0;
 SET min_parallel_table_scan_size=0;
+SET max_parallel_workers_per_gather=2;
 -- Ensure we get a parallel plan
 EXPLAIN (costs off)
 SELECT DISTINCT four FROM tenk1;
@@ -274,6 +275,7 @@ SELECT DISTINCT distinct_func(1) FROM tenk1;
                ->  Parallel Seq Scan on tenk1
 (6 rows)
 
+RESET max_parallel_workers_per_gather;
 RESET min_parallel_table_scan_size;
 RESET parallel_setup_cost;
 RESET parallel_tuple_cost;
diff --git a/src/test/regress/sql/select_distinct.sql b/src/test/regress/sql/select_distinct.sql
index e00582e46c1..1bfe59c26f7 100644
--- a/src/test/regress/sql/select_distinct.sql
+++ b/src/test/regress/sql/select_distinct.sql
@@ -111,6 +111,7 @@ DROP TABLE distinct_group_2;
 SET parallel_tuple_cost=0;
 SET parallel_setup_cost=0;
 SET min_parallel_table_scan_size=0;
+SET max_parallel_workers_per_gather=2;
 
 -- Ensure we get a parallel plan
 EXPLAIN (costs off)
@@ -140,6 +141,7 @@ $$ LANGUAGE plpgsql PARALLEL SAFE;
 EXPLAIN (COSTS OFF)
 SELECT DISTINCT distinct_func(1) FROM tenk1;
 
+RESET max_parallel_workers_per_gather;
 RESET min_parallel_table_scan_size;
 RESET parallel_setup_cost;
 RESET parallel_tuple_cost;