From de65c4dade0a36026f3d0745dc8134186dab49cf Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Wed, 26 Mar 2025 14:22:45 -0400 Subject: [PATCH] Fix oversights in commit 8d5ceb113e3f7ddb627bd40b26438a9d2fa05512 It added bogus whitespace at the end of a line in the documentation. It should not have done that. The pg_overexplain tests must SET debug_parallel_query = false, not just RESET debug_parallel_query, or we get failures on test machines that make debug_parallel_query = true the defualt. --- contrib/pg_overexplain/expected/pg_overexplain.out | 2 +- contrib/pg_overexplain/sql/pg_overexplain.sql | 2 +- doc/src/sgml/pgoverexplain.sgml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/pg_overexplain/expected/pg_overexplain.out b/contrib/pg_overexplain/expected/pg_overexplain.out index 122f1e5da73..f179473d910 100644 --- a/contrib/pg_overexplain/expected/pg_overexplain.out +++ b/contrib/pg_overexplain/expected/pg_overexplain.out @@ -341,7 +341,7 @@ $$); Parse Location: 0 to end (37 rows) -RESET debug_parallel_query; +SET debug_parallel_query = false; RESET enable_seqscan; -- Test the DEBUG option with a non-SELECT query, and also verify that the -- hasReturning flag is shown. diff --git a/contrib/pg_overexplain/sql/pg_overexplain.sql b/contrib/pg_overexplain/sql/pg_overexplain.sql index ae9082b1e85..a9634e443a0 100644 --- a/contrib/pg_overexplain/sql/pg_overexplain.sql +++ b/contrib/pg_overexplain/sql/pg_overexplain.sql @@ -67,7 +67,7 @@ SELECT explain_filter($$ EXPLAIN (DEBUG, COSTS OFF) SELECT genus, array_agg(name ORDER BY name) FROM vegetables GROUP BY genus $$); -RESET debug_parallel_query; +SET debug_parallel_query = false; RESET enable_seqscan; -- Test the DEBUG option with a non-SELECT query, and also verify that the diff --git a/doc/src/sgml/pgoverexplain.sgml b/doc/src/sgml/pgoverexplain.sgml index 102bd275aed..21930fbd3bd 100644 --- a/doc/src/sgml/pgoverexplain.sgml +++ b/doc/src/sgml/pgoverexplain.sgml @@ -92,7 +92,7 @@ - Subplans Needing Rewind. Integer IDs of subplans that + Subplans Needing Rewind. Integer IDs of subplans that may need to be rewound by the executor. -- 2.39.5