diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/storage/lmgr/lock.c | 8 | ||||
| -rwxr-xr-x | src/backend/utils/misc/check_guc | 2 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 10 | ||||
| -rw-r--r-- | src/include/storage/lock.h | 1 |
4 files changed, 2 insertions, 19 deletions
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index 905502f145b..ed8344ff8f2 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -213,12 +213,7 @@ static const LockMethodData user_lockmethod = { AccessExclusiveLock, /* highest valid lock mode number */ true, LockConflicts, - lock_mode_names, -#ifdef LOCK_DEBUG - &Trace_userlocks -#else - &Dummy_trace -#endif + lock_mode_names }; /* @@ -276,7 +271,6 @@ static ResourceOwner awaitedOwner; int Trace_lock_oidmin = FirstNormalObjectId; bool Trace_locks = false; -bool Trace_userlocks = false; int Trace_lock_table = 0; bool Debug_deadlocks = false; diff --git a/src/backend/utils/misc/check_guc b/src/backend/utils/misc/check_guc index 293fb0363f8..91c1c581acd 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 trace_userlocks transaction_isolation transaction_read_only \ +trace_notify 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 106096faee7..f1d35a9a112 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -1059,16 +1059,6 @@ 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, diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h index e106ad54019..bc746a39e4f 100644 --- a/src/include/storage/lock.h +++ b/src/include/storage/lock.h @@ -34,7 +34,6 @@ extern int max_locks_per_xact; #ifdef LOCK_DEBUG extern int Trace_lock_oidmin; extern bool Trace_locks; -extern bool Trace_userlocks; extern int Trace_lock_table; extern bool Debug_deadlocks; #endif /* LOCK_DEBUG */ |