Commit6df6d8e

Neil Conway

committed

Fixes for RESET SESSION patch, per Alvaro. Fix a typo in the RESET

ref page (sorry, my fault!), and simplify the coding ofResetTempTableNamespace().

1 parentc0e42e9 commit6df6d8eCopy full SHA for 6df6d8e

File tree

-20

lines changed

-20

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`<!--`
`2`		`-$PostgreSQL: pgsql/doc/src/sgml/ref/reset.sgml,v 1.33 2007/04/1206:53:46 neilc Exp $`
	`2`	`+$PostgreSQL: pgsql/doc/src/sgml/ref/reset.sgml,v 1.34 2007/04/1222:34:45 neilc Exp $`
`3`	`3`	`PostgreSQL documentation`
`4`	`4`	`-->`
`5`	`5`
`@@ -42,7 +42,7 @@ SET <replaceable class="parameter">configuration_parameter</replaceable> TO DEFA`
`42`	`42`
`43`	`43`	`<para>`
`44`	`44`	`The default value is defined as the value that the parameter would`
`45`		`- have had, if no <command>SET</> ever been issued for it in the`
	`45`	`+ have had, if no <command>SET</>hadever been issued for it in the`
`46`	`46`	`current session. The actual source of this value might be a`
`47`	`47`	`compiled-in default, the configuration file, command-line options,`
`48`	`48`	`or per-database or per-user default settings. See <xref`
`@@ -112,15 +112,15 @@ SET <replaceable class="parameter">configuration_parameter</replaceable> TO DEFA`
`112`	`112`	`Releases all temporary resources associated with the current`
`113`	`113`	`session. This has the same effect as executing the following`
`114`	`114`	`command sequence:`
`115`		`-<synopsis>`
	`115`	`+<programlisting>`
`116`	`116`	`SET SESSION AUTHORIZATION DEFAULT;`
`117`	`117`	`RESET ALL;`
`118`	`118`	`DEALLOCATE ALL;`
`119`	`119`	`CLOSE ALL;`
`120`	`120`	`UNLISTEN *;`
`121`	`121`	`RESET PLANS;`
`122`	`122`	`RESET TEMP;`
`123`		`-</synopsis>`
	`123`	`+</programlisting>`
`124`	`124`	`</para>`
`125`	`125`	`</listitem>`
`126`	`126`	`</varlistentry>`

Lines changed: 3 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`* Portions Copyright (c) 1994, Regents of the University of California`
`14`	`14`	`*`
`15`	`15`	`* IDENTIFICATION`
`16`		`- * $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.94 2007/04/1206:53:46 neilc Exp $`
	`16`	`+ * $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.95 2007/04/1222:34:45 neilc Exp $`
`17`	`17`	`*`
`18`	`18`	`*-------------------------------------------------------------------------`
`19`	`19`	`*/`
`@@ -1946,18 +1946,8 @@ InitTempTableNamespace(void)`
`1946`	`1946`	`void`
`1947`	`1947`	`ResetTempTableNamespace(void)`
`1948`	`1948`	`{`
`1949`		`-charnamespaceName[NAMEDATALEN];`
`1950`		`-OidnamespaceId;`
`1951`		`-`
`1952`		`-/* find oid */`
`1953`		`-snprintf(namespaceName,sizeof(namespaceName),"pg_temp_%d",MyBackendId);`
`1954`		`-namespaceId=GetSysCacheOid(NAMESPACENAME,`
`1955`		`-CStringGetDatum(namespaceName),`
`1956`		`-0,0,0);`
`1957`		`-`
`1958`		`-/* clean if exists */`
`1959`		`-if (OidIsValid(namespaceId))`
`1960`		`-RemoveTempRelations(namespaceId);`
	`1949`	`+if (OidIsValid(myTempNamespace))`
	`1950`	`+RemoveTempRelations(myTempNamespace);`
`1961`	`1951`	`}`
`1962`	`1952`
`1963`	`1953`	`/*`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $PostgreSQL: pgsql/src/include/catalog/namespace.h,v 1.46 2007/04/1206:53:48 neilc Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/include/catalog/namespace.h,v 1.47 2007/04/1222:34:45 neilc Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -81,6 +81,7 @@ extern char NameListToQuotedString(List names);`
`81`	`81`	`externboolisTempNamespace(OidnamespaceId);`
`82`	`82`	`externboolisAnyTempNamespace(OidnamespaceId);`
`83`	`83`	`externboolisOtherTempNamespace(OidnamespaceId);`
	`84`	`+externvoidResetTempTableNamespace(void);`
`84`	`85`
`85`	`86`	`externOverrideSearchPath*GetOverrideSearchPath(MemoryContextcontext);`
`86`	`87`	`externvoidPushOverrideSearchPath(OverrideSearchPath*newpath);`
`@@ -100,6 +101,4 @@ extern char *namespace_search_path;`
`100`	`101`
`101`	`102`	`externList*fetch_search_path(boolincludeImplicit);`
`102`	`103`
`103`		`-externvoidResetTempTableNamespace(void);`
`104`		`-`
`105`	`104`	`#endif/* NAMESPACE_H */`

Comments

(0)