From 0bf08994934d8e561c2cacc4fb4fc7e7eb602d2e Mon Sep 17 00:00:00 2001
From: Robert Haas <rhaas@postgresql.org>
Date: Wed, 19 Oct 2011 23:38:06 -0400
Subject: [PATCH] Remove a few of the new DROP-IF-EXISTS regression tests.

Commit 3301c83536e9da1e573e24ded2e610062dbf9cdc broke the build farm.
Let's try to fix that.
---
 src/test/regress/expected/drop_if_exists.out | 4 ----
 src/test/regress/sql/drop_if_exists.sql      | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/src/test/regress/expected/drop_if_exists.out b/src/test/regress/expected/drop_if_exists.out
index 4a500e6b766..dab73aaba60 100644
--- a/src/test/regress/expected/drop_if_exists.out
+++ b/src/test/regress/expected/drop_if_exists.out
@@ -86,12 +86,8 @@ NOTICE:  role "tg2" does not exist, skipping
 DROP GROUP tg1;
 ERROR:  role "tg1" does not exist
 -- collation
-DROP COLLATION test_collation_exists;
-ERROR:  collation "test_collation_exists" for encoding "UTF8" does not exist
 DROP COLLATION IF EXISTS test_collation_exists;
 NOTICE:  collation "test_collation_exists" does not exist, skipping
-CREATE COLLATION test_collation_exists FROM "POSIX";
-DROP COLLATION test_collation_exists;
 -- conversion
 DROP CONVERSION test_conversion_exists;
 ERROR:  conversion "test_conversion_exists" does not exist
diff --git a/src/test/regress/sql/drop_if_exists.sql b/src/test/regress/sql/drop_if_exists.sql
index f4a0ab16cbd..633056619aa 100644
--- a/src/test/regress/sql/drop_if_exists.sql
+++ b/src/test/regress/sql/drop_if_exists.sql
@@ -109,10 +109,7 @@ DROP GROUP IF EXISTS tg1, tg2;
 DROP GROUP tg1;
 
 -- collation
-DROP COLLATION test_collation_exists;
 DROP COLLATION IF EXISTS test_collation_exists;
-CREATE COLLATION test_collation_exists FROM "POSIX";
-DROP COLLATION test_collation_exists;
 
 -- conversion
 DROP CONVERSION test_conversion_exists;
-- 
GitLab