From be8300b18f26363c0b18c62fa884a6a62e26405e Mon Sep 17 00:00:00 2001
From: "Vadim B. Mikheev" <vadim4o@yahoo.com>
Date: Mon, 27 Jul 1998 19:38:40 +0000
Subject: Use Snapshot in heap access methods.

---
 src/backend/commands/user.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/backend/commands/user.c')

diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index a7849d85fe0..fe0ee302013 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -20,11 +20,7 @@
 
 #include <miscadmin.h>
 #include <catalog/catname.h>
-#ifdef MULTIBYTE
-#include <catalog/pg_database_mb.h>
-#else
 #include <catalog/pg_database.h>
-#endif
 #include <catalog/pg_shadow.h>
 #include <libpq/crypt.h>
 #include <access/heapam.h>
@@ -138,7 +134,7 @@ DefineUser(CreateUserStmt *stmt)
 	 */
 	RelationSetLockForWrite(pg_shadow_rel);
 
-	scan = heap_beginscan(pg_shadow_rel, false, false, 0, NULL);
+	scan = heap_beginscan(pg_shadow_rel, false, SnapshotNow, 0, NULL);
 	while (HeapTupleIsValid(tuple = heap_getnext(scan, 0, &buffer)))
 	{
 		datum = heap_getattr(tuple, Anum_pg_shadow_usename, pg_shadow_dsc, &n);
@@ -268,7 +264,7 @@ AlterUser(AlterUserStmt *stmt)
 	 */
 	RelationSetLockForWrite(pg_shadow_rel);
 
-	scan = heap_beginscan(pg_shadow_rel, false, false, 0, NULL);
+	scan = heap_beginscan(pg_shadow_rel, false, SnapshotNow, 0, NULL);
 	while (HeapTupleIsValid(tuple = heap_getnext(scan, 0, &buffer)))
 	{
 		datum = heap_getattr(tuple, Anum_pg_shadow_usename, pg_shadow_dsc, &n);
@@ -397,7 +393,7 @@ RemoveUser(char *user)
 	 */
 	RelationSetLockForWrite(pg_shadow_rel);
 
-	scan = heap_beginscan(pg_shadow_rel, false, false, 0, NULL);
+	scan = heap_beginscan(pg_shadow_rel, false, SnapshotNow, 0, NULL);
 	while (HeapTupleIsValid(tuple = heap_getnext(scan, 0, &buffer)))
 	{
 		datum = heap_getattr(tuple, Anum_pg_shadow_usename, pg_dsc, &n);
@@ -428,7 +424,7 @@ RemoveUser(char *user)
 	pg_rel = heap_openr(DatabaseRelationName);
 	pg_dsc = RelationGetTupleDescriptor(pg_rel);
 
-	scan = heap_beginscan(pg_rel, false, false, 0, NULL);
+	scan = heap_beginscan(pg_rel, false, SnapshotNow, 0, NULL);
 	while (HeapTupleIsValid(tuple = heap_getnext(scan, 0, &buffer)))
 	{
 		datum = heap_getattr(tuple, Anum_pg_database_datdba, pg_dsc, &n);
-- 
cgit v1.2.3