From 525de8d55653a2ff995350d64cc1fe9a9f87afad Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 26 Apr 2006 22:50:17 +0000
Subject: [PATCH] Improve /contrib/pg_buffercache installation to use
 BEGIN/COMMIT, improve examples.

Mark Kirkwood
---
 contrib/pg_buffercache/README.pg_buffercache | 5 +++--
 contrib/pg_buffercache/pg_buffercache.sql.in | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/contrib/pg_buffercache/README.pg_buffercache b/contrib/pg_buffercache/README.pg_buffercache
index b5c9321553..5fbfbe13c0 100644
--- a/contrib/pg_buffercache/README.pg_buffercache
+++ b/contrib/pg_buffercache/README.pg_buffercache
@@ -76,8 +76,9 @@ Sample output
      isdirty boolean);
 
   regression=# SELECT c.relname, count(*) AS buffers
-               FROM pg_class c, pg_buffercache b
-               WHERE b.relfilenode = c.relfilenode
+               FROM pg_class c INNER JOIN pg_buffercache b
+               ON b.relfilenode = c.relfilenode INNER JOIN pg_database d
+               ON (b.reldatabase = d.oid AND d.datname = current_database())
                GROUP BY c.relname
                ORDER BY 2 DESC LIMIT 10;
                relname             | buffers
diff --git a/contrib/pg_buffercache/pg_buffercache.sql.in b/contrib/pg_buffercache/pg_buffercache.sql.in
index 85c7b2869a..ea63234f6b 100644
--- a/contrib/pg_buffercache/pg_buffercache.sql.in
+++ b/contrib/pg_buffercache/pg_buffercache.sql.in
@@ -1,4 +1,5 @@
 -- Adjust this setting to control where the objects get created.
+BEGIN;
 SET search_path = public;
 
 -- Register the function.
@@ -16,3 +17,5 @@ CREATE VIEW pg_buffercache AS
 -- Don't want these to be available at public.
 REVOKE ALL ON FUNCTION pg_buffercache_pages() FROM PUBLIC;
 REVOKE ALL ON pg_buffercache FROM PUBLIC;
+
+COMMIT;