diff options
Diffstat (limited to 'src/backend/utils/init')
| -rw-r--r-- | src/backend/utils/init/miscinit.c | 23 | ||||
| -rw-r--r-- | src/backend/utils/init/postinit.c | 7 |
2 files changed, 18 insertions, 12 deletions
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index 026f2cc8114..ec223157c4b 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.56 2000/11/04 12:43:24 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.57 2000/11/16 22:30:39 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -340,12 +340,15 @@ SetSessionUserIdFromUserName(const char *username) */ AssertState(!IsBootstrapProcessingMode()); - userTup = SearchSysCacheTuple(SHADOWNAME, - PointerGetDatum(username), - 0, 0, 0); + userTup = SearchSysCache(SHADOWNAME, + PointerGetDatum(username), + 0, 0, 0); if (!HeapTupleIsValid(userTup)) elog(FATAL, "user \"%s\" does not exist", username); + SetSessionUserId( ((Form_pg_shadow) GETSTRUCT(userTup))->usesysid ); + + ReleaseSysCache(userTup); } @@ -355,13 +358,19 @@ SetSessionUserIdFromUserName(const char *username) char * GetUserName(Oid userid) { - HeapTuple tuple; + HeapTuple tuple; + char *result; - tuple = SearchSysCacheTuple(SHADOWSYSID, ObjectIdGetDatum(userid), 0, 0, 0); + tuple = SearchSysCache(SHADOWSYSID, + ObjectIdGetDatum(userid), + 0, 0, 0); if (!HeapTupleIsValid(tuple)) elog(ERROR, "invalid user id %u", (unsigned) userid); - return pstrdup( NameStr(((Form_pg_shadow) GETSTRUCT(tuple))->usename) ); + result = pstrdup( NameStr(((Form_pg_shadow) GETSTRUCT(tuple))->usename) ); + + ReleaseSysCache(tuple); + return result; } diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 3a9e5a1797b..bee4f7e9219 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.71 2000/11/14 18:37:44 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.72 2000/11/16 22:30:39 tgl Exp $ * * *------------------------------------------------------------------------- @@ -320,10 +320,7 @@ InitPostgres(const char *dbname, const char *username) /* * Initialize all the system catalog caches. - */ - zerocaches(); - - /* + * * Does not touch files since all routines are builtins (?) - thomas * 1997-11-01 */ |