git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql

index a6bb57a002e97d4d7065083843940b1c25890569..ad1d5272d7d38ea9c2ee8368447b84fa4ac516c1 100644 (file)

--- a/src/backend/catalog/system_views.sql

+++ b/src/backend/catalog/system_views.sql

*

* Copyright (c) 1996-2008, PostgreSQL Global Development Group

*

- * $PostgreSQL: pgsql/src/backend/catalog/system_views.sql,v 1.50 2008年05月07日 14:41:55 mha Exp $

+ * $PostgreSQL: pgsql/src/backend/catalog/system_views.sql,v 1.51 2008年05月08日 08:58:59 mha Exp $

*/

CREATE VIEW pg_roles AS

S.backend_start,

S.client_addr,

S.client_port

- FROM pg_database D,

- pg_stat_get_activity(NULL) AS S(datid oid, procpid int,

- usesysid oid, current_query text, waiting boolean,

- xact_start timestamptz, query_start timestamptz,

- backend_start timestamptz, client_addr inet, client_port int),

- pg_authid U

+ FROM pg_database D, pg_stat_get_activity(NULL) AS S, pg_authid U

WHERE S.datid = D.oid AND

S.usesysid = U.oid;

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h

index 605f2b74f351c547c604077888c25df39fcaf4fd..9b0cb80e174c4765c3d39390eb8f05dcd1856137 100644 (file)

--- a/src/include/catalog/catversion.h

+++ b/src/include/catalog/catversion.h

* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group

* Portions Copyright (c) 1994, Regents of the University of California

*

- * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.456 2008年05月07日 14:41:55 mha Exp $

+ * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.457 2008年05月08日 08:58:59 mha Exp $

*

*-------------------------------------------------------------------------

*/

*/

/* yyyymmddN */

-#define CATALOG_VERSION_NO 200805071

+#define CATALOG_VERSION_NO 200805081

#endif

diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h

index 201e9ccd7bdc8a14898824ed0b42d9aa4b005966..685b77aca3f1436e66452d365faca43432d468b8 100644 (file)

--- a/src/include/catalog/pg_proc.h

+++ b/src/include/catalog/pg_proc.h

* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group

* Portions Copyright (c) 1994, Regents of the University of California

*

- * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.497 2008年05月07日 14:41:55 mha Exp $

+ * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.498 2008年05月08日 08:58:59 mha Exp $

*

* NOTES

* The script catalog/genbki.sh reads this file and generates .bki

DESCR("statistics: last auto analyze time for a table");

DATA(insert OID = 1936 ( pg_stat_get_backend_idset PGNSP PGUID 12 1 100 f f t t s 0 23 "" _null_ _null_ _null_ pg_stat_get_backend_idset - _null_ _null_ ));

DESCR("statistics: currently active backend IDs");

-DATA(insert OID = 2022 ( pg_stat_get_activity PGNSP PGUID 12 1 100 f f f t s 1 2249 "23" _null_ _null_ _null_ pg_stat_get_activity - _null_ _null_ ));

+DATA(insert OID = 2022 ( pg_stat_get_activity PGNSP PGUID 12 1 100 f f f t s 1 2249 "23" "{23,26,23,26,25,16,1184,1184,1184,869,23}" "{i,o,o,o,o,o,o,o,o,o,o}" "{pid,datid,procpid,usesysid,current_query,waiting,xact_start,query_start,backend_start,client_addr,client_port}" pg_stat_get_activity - _null_ _null_ ));

DESCR("statistics: information about currently active backends");

DATA(insert OID = 2026 ( pg_backend_pid PGNSP PGUID 12 1 0 f f t f s 0 23 "" _null_ _null_ _null_ pg_backend_pid - _null_ _null_ ));

DESCR("statistics: current backend PID");