Fix missing CommandCounterIncrement in DROP USER.

tglsfdc · tglsfdc · commit ee0bcb8c5e55 · 2000-10-19T03:55:51.000Z
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.68 2000/09/19 18:17:54 petere Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.69 2000/10/19 03:55:51 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -600,6 +600,14 @@ DropUser(DropUserStmt *stmt)
 		}
 		heap_endscan(scan);
 		heap_close(pg_rel, AccessExclusiveLock);
+		/*
+		 * Advance command counter so that later iterations of this loop
+		 * will see the changes already made.  This is essential if, for
+		 * example, we are trying to drop two users who are members of the
+		 * same group --- the AlterGroup for the second user had better
+		 * see the tuple updated from the first one.
+		 */
+		CommandCounterIncrement();
 	}
 
 	/*
@@ -643,8 +651,6 @@ CheckPgUserAclNotNull()
 			 "Try 'REVOKE ALL ON \"%s\" FROM PUBLIC'.",
 			 ShadowRelationName, ShadowRelationName);
 	}
-
-	return;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2000, PostgreSQL, Inc`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.68 2000/09/19 18:17:54 petere Exp $`
	`9`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.69 2000/10/19 03:55:51 tgl Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -600,6 +600,14 @@ DropUser(DropUserStmt *stmt)`
`600`	`600`	`}`
`601`	`601`	`heap_endscan(scan);`
`602`	`602`	`heap_close(pg_rel, AccessExclusiveLock);`
	`603`	`+ /*`
	`604`	`+ * Advance command counter so that later iterations of this loop`
	`605`	`+ * will see the changes already made. This is essential if, for`
	`606`	`+ * example, we are trying to drop two users who are members of the`
	`607`	`+ * same group --- the AlterGroup for the second user had better`
	`608`	`+ * see the tuple updated from the first one.`
	`609`	`+ */`
	`610`	`+ CommandCounterIncrement();`
`603`	`611`	`}`
`604`	`612`
`605`	`613`	`/*`
`@@ -643,8 +651,6 @@ CheckPgUserAclNotNull()`
`643`	`651`	`"Try 'REVOKE ALL ON \"%s\" FROM PUBLIC'.",`
`644`	`652`	`ShadowRelationName, ShadowRelationName);`
`645`	`653`	`}`
`646`		`-`
`647`		`- return;`
`648`	`654`	`}`
`649`	`655`
`650`	`656`