postgres.git / summary / log / commit / refs

commit    2a36a724f8032ee5abd008956d2c2495fb57a656
Author:   Alvaro Herrera <alvherre@alvh.no-ip.org>
Date:     Wed Oct 03 15:22:41 2012 +0000
First released in: 9.3.0, 8.3.22, 8.4.15, 9.0.11, 9.1.7, 9.2.2

    REASSIGN OWNED: consider grants on tablespaces, too
    
    Apparently this was considered in the original code (see commit
    cec3b0a9) but I failed to notice that such entries would always be
    skipped by the database check at the start of the loop.
    
    Per bugs #7578 by Nikolay, #6116 by tushar.qa@gmail.com.


 src/backend/catalog/pg_shdepend.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c
index 2420a9855fd..6f4d52c1730 100644
--- a/src/backend/catalog/pg_shdepend.c
+++ b/src/backend/catalog/pg_shdepend.c
@@ -1166,8 +1166,12 @@ shdepDropOwned(List *roleids, DropBehavior behavior)
 			InternalGrant istmt;
 			Form_pg_shdepend sdepForm = (Form_pg_shdepend) GETSTRUCT(tuple);
 
-			/* We only operate on objects in the current database */
-			if (sdepForm->dbid != MyDatabaseId)
+			/*
+			 * We only operate on shared objects and objects in the current
+			 * database
+			 */
+			if (sdepForm->dbid != MyDatabaseId &&
+				sdepForm->dbid != InvalidOid)
 				continue;
 
 			switch (sdepForm->deptype)


[parent: 61540e6d7176]