Remove lock* GUC variables from postgresql.conf.

bmomjian · bmomjian · commit b83f711dec3d · 2003-06-11T05:04:51.000Z
Document why certain GUC variables aren't in postgresql.conf.
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.127 2003/05/28 18:19:09 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.128 2003/06/11 05:04:51 momjian Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -689,6 +689,7 @@ static struct config_int
 		60, 1, 600, NULL, NULL
 	},
 
+	/* Not for general use */
 	{
 		{"pre_auth_delay", PGC_SIGHUP}, &PreAuthDelay,
 		0, 0, 60, NULL, NULL
@@ -871,6 +872,7 @@ static struct config_string
 		"$user,public", assign_search_path, NULL
 	},
 
+	/* Can't be set in postgresql.conf */
 	{
 		{"server_encoding", PGC_INTERNAL, GUC_REPORT},
 		&server_encoding_string,
@@ -888,6 +890,7 @@ static struct config_string
 		"notice", assign_log_min_messages, NULL
 	},
 
+	/* Not for general use --- used by SET SESSION AUTHORIZATION */
 	{
 		{"session_authorization", PGC_USERSET, GUC_NO_SHOW_ALL | GUC_NO_RESET_ALL},
 		&session_authorization_string,
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
@@ -181,20 +181,6 @@
 #stats_block_level = false
 
 
-#
-#	Lock Tracing
-#
-#trace_notify = false
-
-# requires LOCK_DEBUG
-#trace_locks = false
-#trace_userlocks = false
-#trace_lwlocks = false
-#debug_deadlocks = false
-#trace_lock_oidmin = 16384
-#trace_lock_table = 0
-
-
 #
 #	Misc
 #

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* Written by Peter Eisentraut <peter_e@gmx.net>.`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.127 2003/05/28 18:19:09 tgl Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.128 2003/06/11 05:04:51 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*--------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -689,6 +689,7 @@ static struct config_int`
`689`	`689`	`60, 1, 600, NULL, NULL`
`690`	`690`	`},`
`691`	`691`
	`692`	`+ /* Not for general use */`
`692`	`693`	`{`
`693`	`694`	`{"pre_auth_delay", PGC_SIGHUP}, &PreAuthDelay,`
`694`	`695`	`0, 0, 60, NULL, NULL`
`@@ -871,6 +872,7 @@ static struct config_string`
`871`	`872`	`"$user,public", assign_search_path, NULL`
`872`	`873`	`},`
`873`	`874`
	`875`	`+ /* Can't be set in postgresql.conf */`
`874`	`876`	`{`
`875`	`877`	`{"server_encoding", PGC_INTERNAL, GUC_REPORT},`
`876`	`878`	`&server_encoding_string,`
`@@ -888,6 +890,7 @@ static struct config_string`
`888`	`890`	`"notice", assign_log_min_messages, NULL`
`889`	`891`	`},`
`890`	`892`
	`893`	`+ /* Not for general use --- used by SET SESSION AUTHORIZATION */`
`891`	`894`	`{`
`892`	`895`	`{"session_authorization", PGC_USERSET, GUC_NO_SHOW_ALL \| GUC_NO_RESET_ALL},`
`893`	`896`	`&session_authorization_string,`