PG-299: Fix conflicts between devel and master.

Updated sql files (pg_stat_monitor_settings view).

Using right variable name and level checking on pgss_store:
key.toplevel = ((exec_nested_level + plan_nested_level) == 0);
This commit is contained in:
Diego Fronza
2022-01-03 11:01:01 -03:00
committed by Hamid Akhtar
parent 1881fd737b
commit e079e65da0
3 changed files with 11 additions and 7 deletions

View File

@@ -1501,7 +1501,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();