There was enough code drift since this patch, that a couple of bugs

materialized.

New items have been added to GucContext and GucSource enums, but of
course they were not added to the corresponding GucContextName[] and
GucSourceName[] arrays in the patch. Here's a new patch to fix the
resulting bugs.

Joe Conway

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index d6d790095bd7451a5eb1e6a79aa3b50f4099af44..a93399336f0203c867ac2c637eff4c47c067835c 100644 (file)
--- 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.141 2003/07/28 00:09:16 tgl Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.142 2003/07/28 16:22:02 momjian Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -156,7 +156,7 @@ static char *XactIsoLevel_string;
 
 
 /*
- * Used for pg_settings. Keep in sync with config_type enum above
+ * Used for pg_settings. Keep in sync with config_type enum in guc_tables.h
  */
 static char *config_type_name[] = 
 {
@@ -176,6 +176,7 @@ static char *GucContextName[] =
        "sighup",
        "backend",
        "super-user",
+       "userlimit",
        "user"
 };
 
@@ -188,6 +189,7 @@ static char *GucSourceName[] =
        "environment variable",
        "configuration file",
        "command line",
+       "userstart",
        "database",
        "user",
        "client",

diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index 02d2a01d8bf9a20907369021170a049e422d6cab..b7c1b13d0f492a163673c3d0bb229da0f2696c7a 100644 (file)
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -7,7 +7,7 @@
  * Copyright 2000-2003 by PostgreSQL Global Development Group
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
- * $Id: guc.h,v 1.36 2003/07/27 04:35:54 momjian Exp $
+ * $Id: guc.h,v 1.37 2003/07/28 16:22:13 momjian Exp $
  *--------------------------------------------------------------------
  */
 #ifndef GUC_H
@@ -52,6 +52,8 @@
  * non-super users.
  *
  * USERSET options can be set by anyone any time.
+ *
+ * Keep in sync with GucContextName in guc.c
  */
 typedef enum
 {

diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h
index 0eb9376dd573857cf04c345bf8f98f0d429af4fa..564df0da25377023185bd8f25c3e21262bba474e 100644 (file)
--- a/src/include/utils/guc_tables.h
+++ b/src/include/utils/guc_tables.h
@@ -7,7 +7,7 @@
  *
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  *
- *       $Id: guc_tables.h,v 1.2 2003/07/27 04:35:54 momjian Exp $
+ *       $Id: guc_tables.h,v 1.3 2003/07/28 16:22:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -58,6 +58,8 @@ enum config_group
 
 /*
  * GUC supports these types of variables:
+ *
+ * Keep in sync with config_type_name in guc.c
  */
 enum config_type
 {