5 files changed, 13 insertions, 14 deletions
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index 4aee62bb055..5829170d744 100644
--- a/src/backend/utils/cache/lsyscache.c
+++ b/src/backend/utils/cache/lsyscache.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.17 1998/08/11 14:32:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.18 1998/08/11 18:28:18 momjian Exp $
  *
  * NOTES
  *	  Eventually, the index information should go through here, too.
@@ -50,7 +50,7 @@ op_class(Oid oprno, int32 opclass, Oid amopid)
 	if (SearchSysCacheStruct(AMOPOPID,
 							 (char *) &amoptup,
 							 ObjectIdGetDatum(opclass),
-							 ObjectIdGetDatum(opno),
+							 ObjectIdGetDatum(oprno),
 							 ObjectIdGetDatum(amopid),
 							 0))
 		return true;
@@ -245,7 +245,6 @@ op_mergejoinable(Oid opno, Oid ltype, Oid rtype, Oid *leftOp, Oid *rightOp)
 		optup.oprleft == ltype &&
 		optup.oprright == rtype)
 	{
-
 		*leftOp = ObjectIdGetDatum(optup.oprlsortop);
 		*rightOp = ObjectIdGetDatum(optup.oprrsortop);
 		return TRUE;
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index e039e2bfdc1..92a1384b1a9 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.45 1998/08/01 15:26:29 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.46 1998/08/11 18:28:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1063,7 +1063,7 @@ formrdesc(char *relationName,
 	}
 	else
 	{
-		relation->rd_rel->relowner = InvalidOid;		/* XXX incorrect */
+		relation->rd_rel->relowner = 0;
 		relation->rd_rel->relisshared = false;
 	}
 
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index c7dd1727ae2..375f7b6936f 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.18 1998/07/26 04:31:01 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.19 1998/08/11 18:28:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -442,7 +442,7 @@ SetPgUserName()
  */
 static Oid	UserId = InvalidOid;
 
-Oid
+int
 GetUserId()
 {
 	Assert(OidIsValid(UserId));
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 465b41509e4..12d1255b9ba 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.32 1998/07/26 04:31:01 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.33 1998/08/11 18:28:28 momjian Exp $
  *
  * NOTES
  *		InitPostgres() is the function called from PostgresMain
@@ -84,9 +84,9 @@ static void InitUserid(void);
 
 extern char *ExpandDatabasePath(char *name);
 #ifdef MULTIBYTE
-extern void GetRawDatabaseInfo(char *name, Oid *owner, Oid *db_id, char *path, int *encoding);
+extern void GetRawDatabaseInfo(char *name, int4 *owner, Oid *db_id, char *path, int *encoding);
 #else
-extern void GetRawDatabaseInfo(char *name, Oid *owner, Oid *db_id, char *path);
+extern void GetRawDatabaseInfo(char *name, int4 *owner, Oid *db_id, char *path);
 #endif
 
 static IPCKey PostgresIpcKey;
@@ -125,7 +125,7 @@ static IPCKey PostgresIpcKey;
 static void
 InitMyDatabaseInfo(char *name)
 {
-	Oid			owner;
+	int4		owner;
 	char	   *path,
 				myPath[MAXPGPATH + 1];
 #ifdef MULTIBYTE
diff --git a/src/backend/utils/misc/database.c b/src/backend/utils/misc/database.c
index 377058a31b4..9419004042d 100644
--- a/src/backend/utils/misc/database.c
+++ b/src/backend/utils/misc/database.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.14 1998/07/27 19:38:26 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.15 1998/08/11 18:28:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,7 +35,7 @@
  * Pull database information from pg_database.
  */
 int
-GetDatabaseInfo(char *name, Oid *owner, char *path)
+GetDatabaseInfo(char *name, int4 *owner, char *path)
 {
 	Oid			dbowner,
 				dbid;
@@ -179,7 +179,7 @@ ExpandDatabasePath(char *dbpath)
  * --------------------------------
  */
 void
-GetRawDatabaseInfo(char *name, Oid *owner, Oid *db_id, char *path)
+GetRawDatabaseInfo(char *name, int4 *owner, Oid *db_id, char *path)
 {
 	int			dbfd;
 	int			fileflags;