diff options
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 33 | ||||
| -rw-r--r-- | src/backend/utils/mmgr/portalmem.c | 4 |
2 files changed, 3 insertions, 34 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 9b1e813dc6c..a3a8f79a5d1 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut <peter_e@gmx.net>. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.388 2007/04/22 03:52:40 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.389 2007/04/26 16:13:12 neilc Exp $ * *-------------------------------------------------------------------- */ @@ -5048,30 +5048,6 @@ GetPGVariableResultDesc(const char *name) } /* - * RESET SESSION command. - */ -static void -ResetSession(bool isTopLevel) -{ - /* - * Disallow RESET SESSION in a transaction block. This is arguably - * inconsistent (we don't make a similar check in the command - * sequence that RESET SESSION is equivalent to), but the idea is - * to catch mistakes: RESET SESSION inside a transaction block - * would leave the transaction still uncommitted. - */ - PreventTransactionChain(isTopLevel, "RESET SESSION"); - - SetPGVariable("session_authorization", NIL, false); - ResetAllOptions(); - DropAllPreparedStatements(); - PortalHashTableDeleteAll(); - Async_UnlistenAll(); - ResetPlanCache(); - ResetTempTableNamespace(); -} - -/* * RESET command */ void @@ -5079,13 +5055,6 @@ ResetPGVariable(const char *name, bool isTopLevel) { if (pg_strcasecmp(name, "all") == 0) ResetAllOptions(); - else if (pg_strcasecmp(name, "session") == 0) - ResetSession(isTopLevel); - else if (pg_strcasecmp(name, "temp") == 0 || - pg_strcasecmp(name, "temporary") == 0) - ResetTempTableNamespace(); - else if (pg_strcasecmp(name, "plans") == 0) - ResetPlanCache(); else set_config_option(name, NULL, diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c index eeba207dc94..69bb3e3ebdb 100644 --- a/src/backend/utils/mmgr/portalmem.c +++ b/src/backend/utils/mmgr/portalmem.c @@ -12,7 +12,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mmgr/portalmem.c,v 1.101 2007/04/12 06:53:48 neilc Exp $ + * $PostgreSQL: pgsql/src/backend/utils/mmgr/portalmem.c,v 1.102 2007/04/26 16:13:13 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -455,7 +455,7 @@ PortalDrop(Portal portal, bool isTopCommit) /* * Delete all declared cursors. * - * Used by commands: CLOSE ALL, RESET SESSION + * Used by commands: CLOSE ALL, DISCARD ALL */ void PortalHashTableDeleteAll(void) |