From d176b9d5e187fc0317f04847fab0d284d467edb8 Mon Sep 17 00:00:00 2001
From: Noah Misch <noah@leadboat.com>
Date: Fri, 25 Dec 2020 11:02:56 -0800
Subject: [PATCH] Fix back-patch of "Invalidate acl.c caches when pg_authid
 changes."

Test script role names and error messages differed in v10, 9.6 and 9.5.

Discussion: https://postgr.es/m/20201221095028.GB3777719@rfd.leadboat.com
---
 src/test/regress/expected/privileges.out | 6 +++---
 src/test/regress/sql/privileges.sql      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
index 80a604c4251..46f11c241ff 100644
--- a/src/test/regress/expected/privileges.out
+++ b/src/test/regress/expected/privileges.out
@@ -348,10 +348,10 @@ ERROR:  permission denied for relation atest3
 DELETE FROM atest3; -- ok
 BEGIN;
 RESET SESSION AUTHORIZATION;
-ALTER ROLE regress_priv_user1 NOINHERIT;
-SET SESSION AUTHORIZATION regress_priv_user1;
+ALTER ROLE regress_user1 NOINHERIT;
+SET SESSION AUTHORIZATION regress_user1;
 DELETE FROM atest3;
-ERROR:  permission denied for table atest3
+ERROR:  permission denied for relation atest3
 ROLLBACK;
 -- views
 SET SESSION AUTHORIZATION regress_user3;
diff --git a/src/test/regress/sql/privileges.sql b/src/test/regress/sql/privileges.sql
index b7bb9d934df..968704a8f55 100644
--- a/src/test/regress/sql/privileges.sql
+++ b/src/test/regress/sql/privileges.sql
@@ -218,8 +218,8 @@ DELETE FROM atest3; -- ok
 
 BEGIN;
 RESET SESSION AUTHORIZATION;
-ALTER ROLE regress_priv_user1 NOINHERIT;
-SET SESSION AUTHORIZATION regress_priv_user1;
+ALTER ROLE regress_user1 NOINHERIT;
+SET SESSION AUTHORIZATION regress_user1;
 DELETE FROM atest3;
 ROLLBACK;