From: Peter Geoghegan <pg@bowt.ie>
Date: Thu, 11 Mar 2021 07:32:58 +0000 (-0800)
Subject: Drop other index behind pg_upgrade test issue.
X-Git-Tag: REL_12_7~78
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cc33ab95ccea0e1e36651d57ca1c8088f9994c2;p=thirdparty%2Fpostgresql.git

Drop other index behind pg_upgrade test issue.

Fix the test failure by dropping the index in question.  Missed by
commit 57ae7885.

Per buildfarm member crake.

Backpatch: 11-12 only
---

diff --git a/src/test/regress/expected/btree_index.out b/src/test/regress/expected/btree_index.out
index 29c3f439577..0c841aa31a4 100644
--- a/src/test/regress/expected/btree_index.out
+++ b/src/test/regress/expected/btree_index.out
@@ -313,6 +313,7 @@ select reloptions from pg_class WHERE oid = 'btree_idx1'::regclass;
 (1 row)
 
 drop index btree_idx1;
+drop index btree_idx_err;
 --
 -- Test for multilevel page deletion
 --
diff --git a/src/test/regress/sql/btree_index.sql b/src/test/regress/sql/btree_index.sql
index 537c5025d4f..299aab33fe9 100644
--- a/src/test/regress/sql/btree_index.sql
+++ b/src/test/regress/sql/btree_index.sql
@@ -141,6 +141,7 @@ create index btree_idx_err on btree_test(a) with (vacuum_cleanup_index_scale_fac
 alter index btree_idx1 set (vacuum_cleanup_index_scale_factor = 70.0);
 select reloptions from pg_class WHERE oid = 'btree_idx1'::regclass;
 drop index btree_idx1;
+drop index btree_idx_err;
 
 --
 -- Test for multilevel page deletion