aboutsummaryrefslogtreecommitdiff
path: root/src/bin/initdb/initdb.sh
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin/initdb/initdb.sh')
-rw-r--r--src/bin/initdb/initdb.sh19
1 files changed, 5 insertions, 14 deletions
diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh
index f361d0ace75..33264050c8e 100644
--- a/src/bin/initdb/initdb.sh
+++ b/src/bin/initdb/initdb.sh
@@ -27,7 +27,7 @@
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.168 2002/08/17 15:12:07 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.169 2002/08/27 04:00:28 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -977,20 +977,11 @@ CREATE VIEW pg_stat_database AS \
pg_stat_get_db_blocks_hit(D.oid) AS blks_hit \
FROM pg_database D;
-CREATE VIEW pg_locks_result AS \
+CREATE VIEW pg_locks AS \
SELECT \
- ''::oid AS relation, \
- ''::oid AS database, \
- ''::int4 AS backendpid, \
- ''::text AS mode, \
- NULL::bool AS isgranted;
-
-UPDATE pg_proc SET \
- prorettype = (SELECT oid FROM pg_type \
- WHERE typname = 'pg_locks_result') \
- WHERE proname = 'pg_lock_status';
-
-CREATE VIEW pg_locks AS SELECT * FROM pg_lock_status();
+ L.relation, L.database, L.backendpid, L.mode, L.isgranted \
+ FROM pg_lock_status() AS L(relation oid, database oid, \
+ backendpid int4, mode text, isgranted boolean);
CREATE VIEW pg_settings AS \
SELECT \