summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2008-11-26 01:21:08 +0000
committerTom Lane2008-11-26 01:21:08 +0000
commit639f9cef215e4a181c9bc46f26143cf559f0a5fe (patch)
tree90beaeb0443a4050c48be867124a00f452e83233
parent09611425dc1f41fec231f8061a50459595124bba (diff)
Make DISCARD ALL discard advisory locks, too. Marko Kreen
-rw-r--r--doc/src/sgml/ref/discard.sgml1
-rw-r--r--src/backend/commands/discard.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/doc/src/sgml/ref/discard.sgml b/doc/src/sgml/ref/discard.sgml
index ecae00b187..76510a8ee9 100644
--- a/doc/src/sgml/ref/discard.sgml
+++ b/doc/src/sgml/ref/discard.sgml
@@ -80,6 +80,7 @@ RESET ALL;
DEALLOCATE ALL;
CLOSE ALL;
UNLISTEN *;
+SELECT pg_advisory_unlock_all();
DISCARD PLANS;
DISCARD TEMP;
</programlisting>
diff --git a/src/backend/commands/discard.c b/src/backend/commands/discard.c
index d7bddbde98..fd83b4aabe 100644
--- a/src/backend/commands/discard.c
+++ b/src/backend/commands/discard.c
@@ -66,6 +66,7 @@ DiscardAll(bool isTopLevel)
DropAllPreparedStatements();
PortalHashTableDeleteAll();
Async_UnlistenAll();
+ LockReleaseAll(USER_LOCKMETHOD, true);
ResetPlanCache();
ResetTempTableNamespace();
}