summaryrefslogtreecommitdiff
path: root/src/backend/utils
diff options
context:
space:
mode:
authorRobert Haas2011-11-10 22:54:27 +0000
committerRobert Haas2011-11-10 22:54:27 +0000
commit71b2b657c034743f81ae7906d7b0fcc8e9a0a6a3 (patch)
tree14c5210e25e8ac151328ae26832f5a254c4f23af /src/backend/utils
parentcf22e851b6ae8737f3e767dffcadf1722fbb36a7 (diff)
Revert removal of trace_userlocks, because userlocks aren't gone.
This reverts commit 0180bd6180511875db046bf8ddcaa633a2952dfd. contrib/userlock is gone, but user-level locking still exists, and is exposed via the pg_advisory* family of functions.
Diffstat (limited to 'src/backend/utils')
-rwxr-xr-xsrc/backend/utils/misc/check_guc2
-rw-r--r--src/backend/utils/misc/guc.c10
2 files changed, 11 insertions, 1 deletions
diff --git a/src/backend/utils/misc/check_guc b/src/backend/utils/misc/check_guc
index 91c1c581acd..293fb0363f8 100755
--- a/src/backend/utils/misc/check_guc
+++ b/src/backend/utils/misc/check_guc
@@ -20,7 +20,7 @@ INTENTIONALLY_NOT_INCLUDED="autocommit debug_deadlocks \
is_superuser lc_collate lc_ctype lc_messages lc_monetary lc_numeric lc_time \
pre_auth_delay role seed server_encoding server_version server_version_int \
session_authorization trace_lock_oidmin trace_lock_table trace_locks trace_lwlocks \
-trace_notify transaction_isolation transaction_read_only \
+trace_notify trace_userlocks transaction_isolation transaction_read_only \
zero_damaged_pages"
### What options are listed in postgresql.conf.sample, but don't appear
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index a22272c6b76..da7b6d4e90b 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -1061,6 +1061,16 @@ static struct config_bool ConfigureNamesBool[] =
NULL, NULL, NULL
},
{
+ {"trace_userlocks", PGC_SUSET, DEVELOPER_OPTIONS,
+ gettext_noop("No description available."),
+ NULL,
+ GUC_NOT_IN_SAMPLE
+ },
+ &Trace_userlocks,
+ false,
+ NULL, NULL, NULL
+ },
+ {
{"trace_lwlocks", PGC_SUSET, DEVELOPER_OPTIONS,
gettext_noop("No description available."),
NULL,