aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2018-10-16 13:56:58 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2018-10-16 13:56:58 -0400
commit49a1c22889d428558c8e5accb55afa538ef0ca3f (patch)
tree2e8bc7a45485873eb7040b3ee63318b260928957
parent5f920def84a0df35e3a455068ba0ee0df0f45493 (diff)
downloadpostgresql-49a1c22889d428558c8e5accb55afa538ef0ca3f.tar.gz
postgresql-49a1c22889d428558c8e5accb55afa538ef0ca3f.zip
Avoid rare race condition in privileges.sql regression test.
We created a temp table, then switched to a new session, leaving the old session to clean up its temp objects in background. If that took long enough, the eventual attempt to drop the user that owns the temp table could fail, as exhibited today by sidewinder. Fix by dropping the temp table explicitly when we're done with it. It's been like this for quite some time, so back-patch to all supported branches. Report: https://buildfarm.postgresql.org/cgi-bin/show_log.pl?nm=sidewinder&dt=2018-10-16%2014%3A45%3A00
-rw-r--r--src/test/regress/expected/privileges.out1
-rw-r--r--src/test/regress/sql/privileges.sql1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
index aebc89c1b08..7d5d1f0bc1e 100644
--- a/src/test/regress/expected/privileges.out
+++ b/src/test/regress/expected/privileges.out
@@ -1189,6 +1189,7 @@ select has_column_privilege('mytable',2::int2,'select');
(1 row)
+drop table mytable;
-- Grant options
SET SESSION AUTHORIZATION regress_priv_user1;
CREATE TABLE atest4 (a int);
diff --git a/src/test/regress/sql/privileges.sql b/src/test/regress/sql/privileges.sql
index 0c0bba6cf7f..cf9fa9f7823 100644
--- a/src/test/regress/sql/privileges.sql
+++ b/src/test/regress/sql/privileges.sql
@@ -732,6 +732,7 @@ select has_column_privilege('mytable','........pg.dropped.2........','select');
select has_column_privilege('mytable',2::int2,'select');
revoke select on table mytable from regress_priv_user3;
select has_column_privilege('mytable',2::int2,'select');
+drop table mytable;
-- Grant options