Remove GUC USERLIMIT variable category, making the affected variables

plain SUSET instead.  Also delay processing of options received in
client connection request until after we know if the user is a superuser,
so that SUSET values can be set that way by legitimate superusers.
Per recent discussion.

Author: tglsfdc

doc/src/sgml/runtime.sgml

@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.291 2004/11/05 19:15:49 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.292 2004/11/14 19:35:28 tgl Exp $
 -->
 
 <Chapter Id="runtime">
@@ -2150,7 +2150,7 @@ archive_command = 'copy "%p" /mnt/server/archivedir/"%f"'  # Win32
         to the log.  The default is <literal>NOTICE</>.  Note that
         <literal>LOG</> has a different rank here than in
         <varname>client_min_messages</>.
-        Only superusers can increase this option.
+        Only superusers can change this setting.
        </para>
       </listitem>
      </varlistentry>
@@ -2186,7 +2186,7 @@ archive_command = 'copy "%p" /mnt/server/archivedir/"%f"'  # Win32
         SQL statements causing errors, fatal errors, or panics will be
         logged. Enabling this option can be helpful in tracking down
         the source of any errors that appear in the server log.
-        Only superusers can increase this option.
+        Only superusers can change this setting.
        </para>
       </listitem>
      </varlistentry>
@@ -2204,8 +2204,7 @@ archive_command = 'copy "%p" /mnt/server/archivedir/"%f"'  # Win32
          <literal>250</literal> then all SQL statements that run 250ms 
          or longer will be logged.  Enabling this option can be
          useful in tracking down unoptimized queries in your applications.
-         Only superusers can increase this or set it to minus-one if this 
-         option is set by the administrator.
+         Only superusers can change this setting.
         </para>
        </listitem>
       </varlistentry>
@@ -2332,7 +2331,7 @@ archive_command = 'copy "%p" /mnt/server/archivedir/"%f"'  # Win32
         these displays to produce a more readable but much longer
         output format.  <varname>client_min_messages</varname> or
         <varname>log_min_messages</varname> must be
-        <literal>DEBUG1</literal> or lower to send output to the
+        <literal>DEBUG1</literal> or lower to send the output to the
         client or server logs. These options are off by default.
        </para>
       </listitem>
@@ -2372,10 +2371,9 @@ archive_command = 'copy "%p" /mnt/server/archivedir/"%f"'  # Win32
         <varname>log_statement</> to be logged.  When using this option, 
         if you are not using <application>syslog</>, it is recommended 
         that you log the PID or session ID using <varname>log_line_prefix</> 
-        or log the session ID so that you can link the statement to the 
+        so that you can link the statement to the 
         duration using the process ID or session ID. The default is off.  
-        Only superusers can turn off this option if it is enabled by the 
-        administrator.
+        Only superusers can change this setting.
        </para>
       </listitem>
      </varlistentry>
@@ -2487,35 +2485,35 @@ archive_command = 'copy "%p" /mnt/server/archivedir/"%f"'  # Win32
       <listitem>
        <para>
         Controls which SQL statements are logged. Valid values are
-        <literal>all</>, <literal>ddl</>, <literal>mod</>, and
-        <literal>none</>. <literal>ddl</> logs all data definition
+        <literal>none</>, <literal>ddl</>, <literal>mod</>, and
+        <literal>all</>. <literal>ddl</> logs all data definition
         commands like <literal>CREATE</>, <literal>ALTER</>, and
         <literal>DROP</> commands. <literal>mod</> logs all
         <literal>ddl</> statements, plus <literal>INSERT</>,
         <literal>UPDATE</>, <literal>DELETE</>, <literal>TRUNCATE</>,
         and <literal>COPY FROM</>. <literal>PREPARE</> and
-        <literal>EXPLAIN ANALYZE</> statements are also considered for
-        appropriate commands. 
+        <literal>EXPLAIN ANALYZE</> statements are also logged if their
+        contained command is of an appropriate type.
        </para>
        <para>
-        The default is <literal>none</>. Only superusers can reduce 
-        the detail of this option if it has been set by an administrator.
+        The default is <literal>none</>. Only superusers can change this
+        setting.
        </para>
 
        <note>
         <para>
-         The <command>EXECUTE</command> statement not considered a
+         The <command>EXECUTE</command> statement is not considered a
          <literal>ddl</> or <literal>mod</> statement.  When it is logged, 
          only the name of the prepared statement is reported, not the
          actual prepared statement.
         </para>
 
         <para>
-         When a function is defined in a server-side language like
-         <application>PL/pgSQL</application>, any queries executed by
-         the function will only be logged the first time that the
+         When a function is defined in the
+         <application>PL/pgSQL</application>server-side language, any queries
+         executed by the function will only be logged the first time that the
          function is invoked in a particular session. This is because
-         the <application>PL/pgSQL</application> keeps a cache of the
+         <application>PL/pgSQL</application> keeps a cache of the
          query plans produced for the SQL statements in the function.
         </para>
        </note>
@@ -2556,11 +2554,10 @@ archive_command = 'copy "%p" /mnt/server/archivedir/"%f"'  # Win32
         For each query, write performance statistics of the respective
         module to the server log. This is a crude profiling
         instrument.  <varname>log_statement_stats</varname> reports total
-        statement statistics, while the others report per-state statistics.
-        <varname>log_statement_stats</varname> can not be enabled with 
-        the other options.  All of these options are disabled by default.  
-        Only superusers can turn off any of these options if they have
-        been enabled by the administrator.
+        statement statistics, while the others report per-module statistics.
+        <varname>log_statement_stats</varname> cannot be enabled together with
+        any of the per-module options.  All of these options are disabled by
+        default.   Only superusers can change these settings.
        </para>
       </listitem>
      </varlistentry>

src/backend/bootstrap/bootstrap.c

@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.195 2004/10/10 23:37:16 neilc Exp $
+ *	  $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.196 2004/11/14 19:35:29 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -424,7 +424,7 @@ BootstrapMain(int argc, char *argv[])
 	/*
 	 * backend initialization
 	 */
-	InitPostgres(dbname, NULL);
+	(void) InitPostgres(dbname, NULL);
 
 	/*
 	 * In NOP mode, all we really want to do is create shared memory and

src/backend/postmaster/postmaster.c

@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.437 2004/11/09 13:01:26 petere Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.438 2004/11/14 19:35:30 tgl Exp $
  *
  * NOTES
  *
@@ -223,8 +223,6 @@ bool		ClientAuthInProgress = false;		/* T during new-client
  */
 static unsigned int random_seed = 0;
 
-static int	debug_flag = 0;
-
 extern char *optarg;
 extern int	optind,
 			opterr;
@@ -401,17 +399,8 @@ PostmasterMain(int argc, char *argv[])
 				userDoption = optarg;
 				break;
 			case 'd':
-				{
-					/* Turn on debugging for the postmaster. */
-					char	   *debugstr = palloc(strlen("debug") + strlen(optarg) + 1);
-
-					sprintf(debugstr, "debug%s", optarg);
-					SetConfigOption("log_min_messages", debugstr,
-									PGC_POSTMASTER, PGC_S_ARGV);
-					pfree(debugstr);
-					debug_flag = atoi(optarg);
-					break;
-				}
+				set_debug_options(atoi(optarg), PGC_POSTMASTER, PGC_S_ARGV);
+				break;
 			case 'F':
 				SetConfigOption("fsync", "false", PGC_POSTMASTER, PGC_S_ARGV);
 				break;
@@ -2511,7 +2500,6 @@ BackendRun(Port *port)
 	char	  **av;
 	int			maxac;
 	int			ac;
-	char		debugbuf[32];
 	char		protobuf[32];
 	int			i;
 
@@ -2707,15 +2695,6 @@ BackendRun(Port *port)
 
 	av[ac++] = "postgres";
 
-	/*
-	 * Pass the requested debugging level along to the backend.
-	 */
-	if (debug_flag > 0)
-	{
-		snprintf(debugbuf, sizeof(debugbuf), "-d%d", debug_flag);
-		av[ac++] = debugbuf;
-	}
-
 	/*
 	 * Pass any backend switches specified with -o in the postmaster's own
 	 * command line.  We assume these are secure.  (It's OK to mangle
@@ -3404,7 +3383,6 @@ write_backend_variables(char *filename, Port *port)
 	write_var(ProcStructLock, fp);
 	write_var(pgStatSock, fp);
 
-	write_var(debug_flag, fp);
 	write_var(PostmasterPid, fp);
 #ifdef WIN32
 	write_var(PostmasterHandle, fp);
@@ -3478,7 +3456,6 @@ read_backend_variables(char *filename, Port *port)
 	read_var(ProcStructLock, fp);
 	read_var(pgStatSock, fp);
 
-	read_var(debug_flag, fp);
 	read_var(PostmasterPid, fp);
 #ifdef WIN32
 	read_var(PostmasterHandle, fp);