external
/
pg_stat_monitor
mirror of https://github.com/percona/pg_stat_monitor.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #159 from darkfronza/PG-299_fix_conflicts 

PG-299: Fix conflicts between devel and master.
pull/160/head
Ibrar Ahmed 2022-01-04 02:03:01 +05:00 committed by GitHub
parent d3fe5edc80 78c97088cf
commit c05335a326
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pg_stat_monitor--1.0.13.sql.in
View File

@ -119,12 +119,13 @@ LANGUAGE SQL PARALLEL SAFE;
CREATE FUNCTION pg_stat_monitor_settings(
OUT name text,
OUT value INTEGER,
OUT default_value INTEGER,
OUT value text,
OUT default_value text,
OUT description text,
OUT minimum INTEGER,
OUT maximum INTEGER,
OUT restart INTEGER
OUT options text,
OUT restart text
)
RETURNS SETOF record
AS 'MODULE_PATHNAME', 'pg_stat_monitor_settings'
@ -137,6 +138,7 @@ CREATE VIEW pg_stat_monitor_settings AS SELECT
description,
minimum,
maximum,
options,
restart
FROM pg_stat_monitor_settings();

8
pg_stat_monitor--1.0.14.sql.in
View File

@ -119,12 +119,13 @@ LANGUAGE SQL PARALLEL SAFE;
CREATE FUNCTION pg_stat_monitor_settings(
OUT name text,
OUT value INTEGER,
OUT default_value INTEGER,
OUT value text,
OUT default_value text,
OUT description text,
OUT minimum INTEGER,
OUT maximum INTEGER,
OUT restart INTEGER
OUT options text,
OUT restart text
)
RETURNS SETOF record
AS 'MODULE_PATHNAME', 'pg_stat_monitor_settings'
@ -137,6 +138,7 @@ CREATE VIEW pg_stat_monitor_settings AS SELECT
description,
minimum,
maximum,
options,
restart
FROM pg_stat_monitor_settings();

2
pg_stat_monitor.c
View File

@ -1512,7 +1512,7 @@ pgss_store(uint64 queryid,
#if PG_VERSION_NUM < 140000
key.toplevel = 1;
#else
key.toplevel = (nested_level == 0);
key.toplevel = ((exec_nested_level + plan_nested_level) == 0);
#endif
pgss_hash = pgsm_get_hash();