diff --git a/contrib/findoidjoins/README b/contrib/findoidjoins/README
index ef28c51ab843f3126d1bd6a376aa0191d1b2e981..54ef3ccbb40dec3530891d405c83caf641fac578 100644
--- a/contrib/findoidjoins/README
+++ b/contrib/findoidjoins/README
@@ -13,32 +13,30 @@ Run on am empty database, it returns the system join relationships:
---------------------------------------------------------------------------
-Join pg_aggregate.aggbasetype => pg_proc.oid
-Join pg_aggregate.aggbasetype => pg_type.oid
-Join pg_aggregate.aggfinalfn => pg_proc.oid
-Join pg_aggregate.aggfinaltype => pg_proc.oid
-Join pg_aggregate.aggfinaltype => pg_type.oid
-Join pg_aggregate.aggowner => pg_proc.oid
Join pg_aggregate.aggtransfn1 => pg_proc.oid
Join pg_aggregate.aggtransfn2 => pg_proc.oid
+Join pg_aggregate.aggfinalfn => pg_proc.oid
+Join pg_aggregate.aggbasetype => pg_proc.oid
+Join pg_aggregate.aggbasetype => pg_type.oid
Join pg_aggregate.aggtranstype1 => pg_proc.oid
Join pg_aggregate.aggtranstype1 => pg_type.oid
Join pg_aggregate.aggtranstype2 => pg_type.oid
-Join pg_am.ambeginscan => pg_proc.oid
-Join pg_am.ambuild => pg_proc.oid
-Join pg_am.amdelete => pg_proc.oid
-Join pg_am.amendscan => pg_proc.oid
+Join pg_aggregate.aggfinaltype => pg_proc.oid
+Join pg_aggregate.aggfinaltype => pg_type.oid
Join pg_am.amgettuple => pg_proc.oid
Join pg_am.aminsert => pg_proc.oid
-Join pg_am.ammarkpos => pg_proc.oid
-Join pg_am.amowner => pg_proc.oid
+Join pg_am.amdelete => pg_proc.oid
+Join pg_am.ambeginscan => pg_proc.oid
Join pg_am.amrescan => pg_proc.oid
+Join pg_am.amendscan => pg_proc.oid
+Join pg_am.ammarkpos => pg_proc.oid
Join pg_am.amrestrpos => pg_proc.oid
-Join pg_amop.amopclaid => pg_opclass.oid
+Join pg_am.ambuild => pg_proc.oid
Join pg_amop.amopid => pg_am.oid
-Join pg_amop.amopnpages => pg_proc.oid
+Join pg_amop.amopclaid => pg_opclass.oid
Join pg_amop.amopopr => pg_operator.oid
Join pg_amop.amopselect => pg_proc.oid
+Join pg_amop.amopnpages => pg_proc.oid
Join pg_amproc.amid => pg_am.oid
Join pg_amproc.amopclaid => pg_opclass.oid
Join pg_amproc.amopclaid => pg_operator.oid
@@ -47,42 +45,37 @@ Join pg_amproc.amproc => pg_operator.oid
Join pg_amproc.amproc => pg_proc.oid
Join pg_attribute.attrelid => pg_class.oid
Join pg_attribute.atttypid => pg_type.oid
-Join pg_class.relam => pg_am.oid
-Join pg_class.relowner => pg_proc.oid
Join pg_class.reltype => pg_type.oid
+Join pg_class.relam => pg_am.oid
Join pg_description.objoid => pg_proc.oid
Join pg_description.objoid => pg_type.oid
Join pg_index.indexrelid => pg_class.oid
-Join pg_index.indproc => pg_proc.oid
Join pg_index.indrelid => pg_class.oid
+Join pg_index.indproc => pg_proc.oid
Join pg_opclass.opcdeftype => pg_type.oid
-Join pg_operator.oprcode => pg_proc.oid
-Join pg_operator.oprcom => pg_operator.oid
-Join pg_operator.oprjoin => pg_proc.oid
Join pg_operator.oprleft => pg_type.oid
-Join pg_operator.oprlsortop => pg_operator.oid
-Join pg_operator.oprnegate => pg_operator.oid
-Join pg_operator.oprowner => pg_proc.oid
-Join pg_operator.oprrest => pg_proc.oid
-Join pg_operator.oprresult => pg_type.oid
Join pg_operator.oprright => pg_type.oid
+Join pg_operator.oprresult => pg_type.oid
+Join pg_operator.oprcom => pg_operator.oid
+Join pg_operator.oprnegate => pg_operator.oid
+Join pg_operator.oprlsortop => pg_operator.oid
Join pg_operator.oprrsortop => pg_operator.oid
+Join pg_operator.oprcode => pg_proc.oid
+Join pg_operator.oprrest => pg_proc.oid
+Join pg_operator.oprjoin => pg_proc.oid
Join pg_parg.parproid => pg_operator.oid
Join pg_parg.parproid => pg_proc.oid
Join pg_parg.partype => pg_type.oid
Join pg_proc.prolang => pg_language.oid
-Join pg_proc.proowner => pg_proc.oid
Join pg_proc.prorettype => pg_type.oid
Join pg_rewrite.ev_class => pg_class.oid
-Join pg_statistic.starelid => pg_class.oid
+Join pg_type.typrelid => pg_class.oid
Join pg_type.typelem => pg_operator.oid
Join pg_type.typelem => pg_proc.oid
Join pg_type.typelem => pg_type.oid
Join pg_type.typinput => pg_proc.oid
Join pg_type.typoutput => pg_proc.oid
-Join pg_type.typowner => pg_proc.oid
Join pg_type.typreceive => pg_proc.oid
-Join pg_type.typrelid => pg_class.oid
Join pg_type.typsend => pg_proc.oid
diff --git a/contrib/findoidjoins/findoidjoins.c b/contrib/findoidjoins/findoidjoins.c
index 8b9144ee92b3582d54338fe6881b60f780462b63..b1178b5834d1d0046cf3729a7eebdc487c705e22 100644
--- a/contrib/findoidjoins/findoidjoins.c
+++ b/contrib/findoidjoins/findoidjoins.c
@@ -39,7 +39,7 @@ main(int argc, char **argv)
typname = 'regproc') AND \
a.attrelid = c.oid AND \
a.atttypid = t.oid \
- ORDER BY 2, 3; \
+ ORDER BY 2, a.attnum ; \
");
doquery("FETCH ALL IN c_attributes");
attres = get_result();
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index 254608e8883b725d3e8374c8fe2cf914b51fa331..322e65bb8e00ca206f42076aad7e26834863a2bb 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.12 1998/07/27 19:37:45 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.13 1998/08/11 18:28:11 momjian Exp $
*
* NOTES
* See acl.h.
@@ -455,14 +455,14 @@ pg_aclcheck(char *relname, char *usename, AclMode mode)
* if the acl is null, by default the owner can do whatever he
* wants to with it
*/
- Oid ownerId;
+ int4 ownerId;
relation = heap_openr(RelationRelationName);
- ownerId = (Oid) heap_getattr(htp,
+ ownerId = (int4) heap_getattr(htp,
Anum_pg_class_relowner,
RelationGetTupleDescriptor(relation),
(bool *) NULL);
- acl = aclownerdefault(relname, ownerId);
+ acl = aclownerdefault(relname, (AclId)ownerId);
}
#else
{ /* This is why the syscache is great... */
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 140050cd420f792c9ddc097c6d31f62016e5e469..d202388c6859c06ccc906b6e682ccf0a2e23428c 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.18 1998/07/27 19:37:52 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.19 1998/08/11 18:28:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -38,7 +38,7 @@
/* non-export function prototypes */
static void
check_permissions(char *command, char *dbpath, char *dbname,
- Oid *dbIdP, Oid *userIdP);
+ Oid *dbIdP, int4 *userIdP);
static HeapTuple get_pg_dbtup(char *command, char *dbname, Relation dbrel);
static void stop_vacuum(char *dbpath, char *dbname);
@@ -191,12 +191,12 @@ check_permissions(char *command,
char *dbpath,
char *dbname,
Oid *dbIdP,
- Oid *userIdP)
+ int4 *userIdP)
{
Relation dbrel;
HeapTuple dbtup,
utup;
- Oid dbowner = (Oid) 0;
+ int4 dbowner = 0;
char use_createdb;
bool dbfound;
bool use_super;
@@ -250,7 +250,7 @@ check_permissions(char *command,
if (dbfound)
{
- dbowner = (Oid) heap_getattr(dbtup,
+ dbowner = (int4) heap_getattr(dbtup,
Anum_pg_database_datdba,
RelationGetTupleDescriptor(dbrel),
(char *) NULL);
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 91b45033cf8b763dfa7e7209333c2d784781ba09..74df4039063e96c401fa6681510a4b1c3388e967 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.35 1998/07/26 04:30:44 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.36 1998/08/11 18:28:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -565,8 +565,8 @@ mdblindwrt(char *dbstr,
/* this is work arround only !!! */
{
char dbpath[MAXPGPATH + 1];
- Oid owner,
- id;
+ int4 owner;
+ Oid id;
char *tmpPath;
#ifdef MULTIBYTE
int tmpEncoding;
@@ -610,8 +610,8 @@ mdblindwrt(char *dbstr,
/* this is work arround only !!! */
{
char dbpath[MAXPGPATH + 1];
- Oid owner,
- id;
+ int4 owner;
+ Oid id;
char *tmpPath;
#ifdef MULTIBYTE
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index 4aee62bb0554936c4b1809cca7f2d1eca5da6cc4..5829170d744ab477b9eee6e2bf6eb6729d7391a4 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 e039e2bfdc1edb6d9f7782ed0147ebb97a2ef3f0..92a1384b1a9e6c624958d92fe0d136131f9e8efb 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 c7dd1727ae2f13d16b531077512aa8b78ac6df32..375f7b6936f9e06856d446e8f062f1c1570d55c8 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 465b41509e483e3294f813e48019921414b16b52..12d1255b9ba81cb28734793838d61f2af642f250 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 377058a31b4b602f4170bc605ce1bbeced9a0e8e..9419004042dd445b297ba077ca69260d7bac3026 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;
diff --git a/src/include/catalog/pg_aggregate.h b/src/include/catalog/pg_aggregate.h
index 27c3c4f249a03d79cf50c03c09b0cf8806f28b99..fd45b249887f5ee72e162bfe116aacdb4ce23631 100644
--- a/src/include/catalog/pg_aggregate.h
+++ b/src/include/catalog/pg_aggregate.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_aggregate.h,v 1.15 1998/07/08 14:08:58 thomas Exp $
+ * $Id: pg_aggregate.h,v 1.16 1998/08/11 18:28:36 momjian Exp $
*
* NOTES
* the genbki.sh script reads this file and generates .bki
@@ -45,7 +45,7 @@
CATALOG(pg_aggregate)
{
NameData aggname;
- Oid aggowner;
+ int4 aggowner;
regproc aggtransfn1;
regproc aggtransfn2;
regproc aggfinalfn;
diff --git a/src/include/catalog/pg_am.h b/src/include/catalog/pg_am.h
index a088ef49e51bcfff1be860c8819e16e311efcfac..2b1667c6b11f19887bb04d06e87b7c5112b33b29 100644
--- a/src/include/catalog/pg_am.h
+++ b/src/include/catalog/pg_am.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_am.h,v 1.6 1998/08/11 05:32:43 momjian Exp $
+ * $Id: pg_am.h,v 1.7 1998/08/11 18:28:37 momjian Exp $
*
* NOTES
* the genbki.sh script reads this file and generates .bki
@@ -36,7 +36,7 @@
CATALOG(pg_am)
{
NameData amname;
- Oid amowner;
+ int4 amowner;
char amkind;
int2 amstrategies;
int2 amsupport;
diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h
index 09a424f1435979a4a8a831ea6453fc2892d24e45..9a20dd825e98d2a017ec17bf1b96209c849c011e 100644
--- a/src/include/catalog/pg_attribute.h
+++ b/src/include/catalog/pg_attribute.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_attribute.h,v 1.33 1998/07/12 21:29:28 momjian Exp $
+ * $Id: pg_attribute.h,v 1.34 1998/08/11 18:28:39 momjian Exp $
*
* NOTES
* the genbki.sh script reads this file and generates .bki
@@ -179,7 +179,7 @@ typedef FormData_pg_attribute *AttributeTupleForm;
*/
#define Schema_pg_type \
{ 1247, {"typname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \
-{ 1247, {"typowner"}, 26, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
+{ 1247, {"typowner"}, 23, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1247, {"typlen"}, 21, 0, 2, 3, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \
{ 1247, {"typprtlen"}, 21, 0, 2, 4, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \
{ 1247, {"typbyval"}, 16, 0, 1, 5, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \
@@ -196,7 +196,7 @@ typedef FormData_pg_attribute *AttributeTupleForm;
{ 1247, {"typdefault"}, 25, 0, -1, 16, 0, -1, -1, '\0' , '\0', 'i', '\0', '\0' }
DATA(insert OID = 0 ( 1247 typname 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f));
-DATA(insert OID = 0 ( 1247 typowner 26 0 4 2 0 -1 -1 t f i f f));
+DATA(insert OID = 0 ( 1247 typowner 23 0 4 2 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1247 typlen 21 0 2 3 0 -1 -1 t f s f f));
DATA(insert OID = 0 ( 1247 typprtlen 21 0 2 4 0 -1 -1 t f s f f));
DATA(insert OID = 0 ( 1247 typbyval 16 0 1 5 0 -1 -1 t f c f f));
@@ -238,7 +238,7 @@ DATA(insert OID = 0 ( 1262 cmax 29 0 4 -6 0 -1 -1 t f i f f));
*/
#define Schema_pg_proc \
{ 1255, {"proname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \
-{ 1255, {"proowner"}, 26, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
+{ 1255, {"proowner"}, 23, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1255, {"prolang"}, 26, 0, 4, 3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1255, {"proisinh"}, 16, 0, 1, 4, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \
{ 1255, {"proistrusted"}, 16, 0, 1, 5, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \
@@ -255,7 +255,7 @@ DATA(insert OID = 0 ( 1262 cmax 29 0 4 -6 0 -1 -1 t f i f f));
{ 1255, {"probin"}, 17, 0, -1, 16, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }
DATA(insert OID = 0 ( 1255 proname 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f));
-DATA(insert OID = 0 ( 1255 proowner 26 0 4 2 0 -1 -1 t f i f f));
+DATA(insert OID = 0 ( 1255 proowner 23 0 4 2 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1255 prolang 26 0 4 3 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1255 proisinh 16 0 1 4 0 -1 -1 t f c f f));
DATA(insert OID = 0 ( 1255 proistrusted 16 0 1 5 0 -1 -1 t f c f f));
@@ -358,7 +358,7 @@ DATA(insert OID = 0 ( 1249 cmax 29 0 4 -6 0 -1 -1 t f i f f));
#define Schema_pg_class \
{ 1259, {"relname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \
{ 1259, {"reltype"}, 26, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
-{ 1259, {"relowner"}, 26, 0, 4, 3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
+{ 1259, {"relowner"}, 23, 0, 4, 3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1259, {"relam"}, 26, 0, 4, 4, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1259, {"relpages"}, 23, 0, 4, 5, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1259, {"reltuples"}, 23, 0, 4, 6, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
@@ -373,7 +373,7 @@ DATA(insert OID = 0 ( 1249 cmax 29 0 4 -6 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1259 relname 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f));
DATA(insert OID = 0 ( 1259 reltype 26 0 4 2 0 -1 -1 t f i f f));
-DATA(insert OID = 0 ( 1259 relowner 26 0 4 3 0 -1 -1 t f i f f));
+DATA(insert OID = 0 ( 1259 relowner 23 0 4 3 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1259 relam 26 0 4 4 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1259 relpages 23 0 4 5 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1259 reltuples 23 0 4 6 0 -1 -1 t f i f f));
diff --git a/src/include/catalog/pg_attribute_mb.h b/src/include/catalog/pg_attribute_mb.h
index c7cbfa30ec9d95684b0b232538fbd05405ff0410..732c604468fdc97b5c1b57a0732761368e335b9d 100644
--- a/src/include/catalog/pg_attribute_mb.h
+++ b/src/include/catalog/pg_attribute_mb.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_attribute_mb.h,v 1.2 1998/08/06 05:13:03 momjian Exp $
+ * $Id: pg_attribute_mb.h,v 1.3 1998/08/11 18:28:41 momjian Exp $
*
* NOTES
* the genbki.sh script reads this file and generates .bki
@@ -179,7 +179,7 @@ typedef FormData_pg_attribute *AttributeTupleForm;
*/
#define Schema_pg_type \
{ 1247, {"typname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \
-{ 1247, {"typowner"}, 26, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
+{ 1247, {"typowner"}, 23, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1247, {"typlen"}, 21, 0, 2, 3, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \
{ 1247, {"typprtlen"}, 21, 0, 2, 4, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \
{ 1247, {"typbyval"}, 16, 0, 1, 5, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \
@@ -196,7 +196,7 @@ typedef FormData_pg_attribute *AttributeTupleForm;
{ 1247, {"typdefault"}, 25, 0, -1, 16, 0, -1, -1, '\0' , '\0', 'i', '\0', '\0' }
DATA(insert OID = 0 ( 1247 typname 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f));
-DATA(insert OID = 0 ( 1247 typowner 26 0 4 2 0 -1 -1 t f i f f));
+DATA(insert OID = 0 ( 1247 typowner 23 0 4 2 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1247 typlen 21 0 2 3 0 -1 -1 t f s f f));
DATA(insert OID = 0 ( 1247 typprtlen 21 0 2 4 0 -1 -1 t f s f f));
DATA(insert OID = 0 ( 1247 typbyval 16 0 1 5 0 -1 -1 t f c f f));
@@ -239,7 +239,7 @@ DATA(insert OID = 0 ( 1262 cmax 29 0 4 -6 0 -1 -1 t f i f f));
*/
#define Schema_pg_proc \
{ 1255, {"proname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \
-{ 1255, {"proowner"}, 26, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
+{ 1255, {"proowner"}, 23, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1255, {"prolang"}, 26, 0, 4, 3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1255, {"proisinh"}, 16, 0, 1, 4, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \
{ 1255, {"proistrusted"}, 16, 0, 1, 5, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \
@@ -256,7 +256,7 @@ DATA(insert OID = 0 ( 1262 cmax 29 0 4 -6 0 -1 -1 t f i f f));
{ 1255, {"probin"}, 17, 0, -1, 16, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }
DATA(insert OID = 0 ( 1255 proname 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f));
-DATA(insert OID = 0 ( 1255 proowner 26 0 4 2 0 -1 -1 t f i f f));
+DATA(insert OID = 0 ( 1255 proowner 23 0 4 2 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1255 prolang 26 0 4 3 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1255 proisinh 16 0 1 4 0 -1 -1 t f c f f));
DATA(insert OID = 0 ( 1255 proistrusted 16 0 1 5 0 -1 -1 t f c f f));
@@ -359,7 +359,7 @@ DATA(insert OID = 0 ( 1249 cmax 29 0 4 -6 0 -1 -1 t f i f f));
#define Schema_pg_class \
{ 1259, {"relname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \
{ 1259, {"reltype"}, 26, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
-{ 1259, {"relowner"}, 26, 0, 4, 3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
+{ 1259, {"relowner"}, 23, 0, 4, 3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1259, {"relam"}, 26, 0, 4, 4, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1259, {"relpages"}, 23, 0, 4, 5, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1259, {"reltuples"}, 23, 0, 4, 6, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
@@ -374,7 +374,7 @@ DATA(insert OID = 0 ( 1249 cmax 29 0 4 -6 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1259 relname 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f));
DATA(insert OID = 0 ( 1259 reltype 26 0 4 2 0 -1 -1 t f i f f));
-DATA(insert OID = 0 ( 1259 relowner 26 0 4 3 0 -1 -1 t f i f f));
+DATA(insert OID = 0 ( 1259 relowner 23 0 4 3 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1259 relam 26 0 4 4 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1259 relpages 23 0 4 5 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1259 reltuples 23 0 4 6 0 -1 -1 t f i f f));
diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h
index 1702a2e0e1d3772084c7cd989a231200172e411b..25f5ea223f976b4e3359f030763db2bdecfaa5b7 100644
--- a/src/include/catalog/pg_class.h
+++ b/src/include/catalog/pg_class.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_class.h,v 1.21 1998/08/06 05:13:05 momjian Exp $
+ * $Id: pg_class.h,v 1.22 1998/08/11 18:28:43 momjian Exp $
*
* NOTES
* ``pg_relation'' is being replaced by ``pg_class''. currently
@@ -54,7 +54,7 @@ CATALOG(pg_class) BOOTSTRAP
{
NameData relname;
Oid reltype;
- Oid relowner;
+ int4 relowner;
Oid relam;
int4 relpages;
int4 reltuples;
diff --git a/src/include/catalog/pg_class_mb.h b/src/include/catalog/pg_class_mb.h
index 5135e4403aa78ded35f9850534b1d3f1f3f609f0..0e98acf42e1660003839ea6c39a8d219f7278f73 100644
--- a/src/include/catalog/pg_class_mb.h
+++ b/src/include/catalog/pg_class_mb.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_class_mb.h,v 1.2 1998/08/06 05:13:07 momjian Exp $
+ * $Id: pg_class_mb.h,v 1.3 1998/08/11 18:28:44 momjian Exp $
*
* NOTES
* ``pg_relation'' is being replaced by ``pg_class''. currently
@@ -54,7 +54,7 @@ CATALOG(pg_class) BOOTSTRAP
{
NameData relname;
Oid reltype;
- Oid relowner;
+ int4 relowner;
Oid relam;
int4 relpages;
int4 reltuples;
diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h
index 6559332dfba0ba120864f3f92ab83b6d3a5e6e89..0a3820459bf4dc9fe965c3870f24d42c360678d8 100644
--- a/src/include/catalog/pg_operator.h
+++ b/src/include/catalog/pg_operator.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_operator.h,v 1.32 1998/07/08 14:08:59 thomas Exp $
+ * $Id: pg_operator.h,v 1.33 1998/08/11 18:28:45 momjian Exp $
*
* NOTES
* the genbki.sh script reads this file and generates .bki
@@ -36,7 +36,7 @@
CATALOG(pg_operator)
{
NameData oprname;
- Oid oprowner;
+ int4 oprowner;
int2 oprprec;
char oprkind;
bool oprisleft;
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index bf8257375113aa75f3218bf62aeb70c0c97619af..5de1f6eaee823e1babb6c71b6acd43a3767218de 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_proc.h,v 1.63 1998/07/24 03:32:16 scrappy Exp $
+ * $Id: pg_proc.h,v 1.64 1998/08/11 18:28:47 momjian Exp $
*
* NOTES
* The script catalog/genbki.sh reads this file and generates .bki
@@ -39,7 +39,7 @@
CATALOG(pg_proc) BOOTSTRAP
{
NameData proname;
- Oid proowner;
+ int4 proowner;
Oid prolang;
bool proisinh;
bool proistrusted;
diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index 71bca3c013f39e53632b6f8dd6e8b1b75e10a490..bfda556afe048cd3e682c305c4597dda40c55284 100644
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_type.h,v 1.42 1998/07/20 19:21:45 momjian Exp $
+ * $Id: pg_type.h,v 1.43 1998/08/11 18:28:49 momjian Exp $
*
* NOTES
* the genbki.sh script reads this file and generates .bki
@@ -40,7 +40,7 @@
CATALOG(pg_type) BOOTSTRAP
{
NameData typname;
- Oid typowner;
+ int4 typowner;
int2 typlen;
/*
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index e1b4831f294cb1f6151aff6b4c0555960257f0f6..c8c5e2dfd76e4ab191a583ec7c50e1e302bd2dff 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -11,7 +11,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: miscadmin.h,v 1.29 1998/07/26 04:31:23 scrappy Exp $
+ * $Id: miscadmin.h,v 1.30 1998/08/11 18:28:33 momjian Exp $
*
* NOTES
* some of the information in this file will be moved to
@@ -117,11 +117,11 @@ extern char *DatabasePath;
/* in utils/misc/database.c */
#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
-extern int GetDatabaseInfo(char *name, Oid *owner, char *path);
+extern int GetDatabaseInfo(char *name, int4 *owner, char *path);
extern char *ExpandDatabasePath(char *path);
/* now in utils/init/miscinit.c */
@@ -134,7 +134,7 @@ extern const char *getdatabaseencoding(void);
extern char *getpgusername(void);
extern void SetPgUserName(void);
-extern Oid GetUserId(void);
+extern int GetUserId(void);
extern void SetUserId(void);
extern int ValidateBinary(char *path);
extern int FindExec(char *backend, char *argv0, char *binary_name);