diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/adt/pgstatfuncs.c | 8 | ||||
| -rw-r--r-- | src/bin/initdb/initdb.sh | 4 | ||||
| -rw-r--r-- | src/include/catalog/pg_proc.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c index c2f0ea2c829..787f0226cdc 100644 --- a/src/backend/utils/adt/pgstatfuncs.c +++ b/src/backend/utils/adt/pgstatfuncs.c @@ -308,14 +308,14 @@ pg_stat_get_backend_activity_start(PG_FUNCTION_ARGS) int32 beid; AbsoluteTime sec; int usec; - Timestamp result; + TimestampTz result; beid = PG_GETARG_INT32(0); - if (!superuser()) + if ((beentry = pgstat_fetch_stat_beentry(beid)) == NULL) PG_RETURN_NULL(); - if ((beentry = pgstat_fetch_stat_beentry(beid)) == NULL) + if (!superuser() && beentry->userid != GetUserId()) PG_RETURN_NULL(); sec = beentry->activity_start_sec; @@ -341,7 +341,7 @@ pg_stat_get_backend_activity_start(PG_FUNCTION_ARGS) date2j(1970, 1, 1)) * 86400)); #endif - PG_RETURN_TIMESTAMP(result); + PG_RETURN_TIMESTAMPTZ(result); } diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh index 473b2786cf1..079ceb076b2 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.187 2003/03/25 16:15:44 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.188 2003/04/04 03:03:53 tgl Exp $ # #------------------------------------------------------------------------- @@ -954,7 +954,7 @@ CREATE VIEW pg_stat_activity AS \ pg_stat_get_backend_userid(S.backendid) AS usesysid, \ U.usename AS usename, \ pg_stat_get_backend_activity(S.backendid) AS current_query, \ - pg_stat_get_backend_activity_start(S.backendid) AS query_start \ + pg_stat_get_backend_activity_start(S.backendid) AS query_start \ FROM pg_database D, \ (SELECT pg_stat_get_backend_idset() AS backendid) AS S, \ pg_shadow U \ diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index ff9f65d962e..6c0bcfdfc9f 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_proc.h,v 1.290 2003/03/21 21:54:29 momjian Exp $ + * $Id: pg_proc.h,v 1.291 2003/04/04 03:03:54 tgl Exp $ * * NOTES * The script catalog/genbki.sh reads this file and generates .bki @@ -2745,7 +2745,7 @@ DATA(insert OID = 1939 ( pg_stat_get_backend_userid PGNSP PGUID 12 f f t f s 1 DESCR("Statistics: User ID of backend"); DATA(insert OID = 1940 ( pg_stat_get_backend_activity PGNSP PGUID 12 f f t f s 1 25 "23" pg_stat_get_backend_activity - _null_ )); DESCR("Statistics: Current query of backend"); -DATA(insert OID = 2094 ( pg_stat_get_backend_activity_start PGNSP PGUID 12 f f t f s 1 1114 "23" pg_stat_get_backend_activity_start - _null_)); +DATA(insert OID = 2094 ( pg_stat_get_backend_activity_start PGNSP PGUID 12 f f t f s 1 1184 "23" pg_stat_get_backend_activity_start - _null_)); DESCR("Statistics: Start time for current query of backend"); DATA(insert OID = 1941 ( pg_stat_get_db_numbackends PGNSP PGUID 12 f f t f s 1 23 "26" pg_stat_get_db_numbackends - _null_ )); DESCR("Statistics: Number of backends in database"); |