diff options
| author | Neil Conway <neilc@samurai.com> | 2007-04-12 22:34:45 +0000 |
|---|---|---|
| committer | Neil Conway <neilc@samurai.com> | 2007-04-12 22:34:45 +0000 |
| commit | 6df6d8e36104003c7a4e4724278809011a871bd2 (patch) | |
| tree | 32ebafdfda8d86b9a02a140056eb190ab4c889b8 /src | |
| parent | c0e42e9325949a692d0803331e60ae87d2f76684 (diff) | |
Fixes for RESET SESSION patch, per Alvaro. Fix a typo in the RESET
ref page (sorry, my fault!), and simplify the coding of
ResetTempTableNamespace().
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/catalog/namespace.c | 16 | ||||
| -rw-r--r-- | src/include/catalog/namespace.h | 5 |
2 files changed, 5 insertions, 16 deletions
diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c index 16853b3d791..ca51b997c0b 100644 --- a/src/backend/catalog/namespace.c +++ b/src/backend/catalog/namespace.c @@ -13,7 +13,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.94 2007/04/12 06:53:46 neilc Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.95 2007/04/12 22:34:45 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -1946,18 +1946,8 @@ InitTempTableNamespace(void) void ResetTempTableNamespace(void) { - char namespaceName[NAMEDATALEN]; - Oid namespaceId; - - /* find oid */ - snprintf(namespaceName, sizeof(namespaceName), "pg_temp_%d", MyBackendId); - namespaceId = GetSysCacheOid(NAMESPACENAME, - CStringGetDatum(namespaceName), - 0, 0, 0); - - /* clean if exists */ - if (OidIsValid(namespaceId)) - RemoveTempRelations(namespaceId); + if (OidIsValid(myTempNamespace)) + RemoveTempRelations(myTempNamespace); } /* diff --git a/src/include/catalog/namespace.h b/src/include/catalog/namespace.h index 456d22f942c..0050c122a77 100644 --- a/src/include/catalog/namespace.h +++ b/src/include/catalog/namespace.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/namespace.h,v 1.46 2007/04/12 06:53:48 neilc Exp $ + * $PostgreSQL: pgsql/src/include/catalog/namespace.h,v 1.47 2007/04/12 22:34:45 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -81,6 +81,7 @@ extern char *NameListToQuotedString(List *names); extern bool isTempNamespace(Oid namespaceId); extern bool isAnyTempNamespace(Oid namespaceId); extern bool isOtherTempNamespace(Oid namespaceId); +extern void ResetTempTableNamespace(void); extern OverrideSearchPath *GetOverrideSearchPath(MemoryContext context); extern void PushOverrideSearchPath(OverrideSearchPath *newpath); @@ -100,6 +101,4 @@ extern char *namespace_search_path; extern List *fetch_search_path(bool includeImplicit); -extern void ResetTempTableNamespace(void); - #endif /* NAMESPACE_H */ |