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 90a7504c79285ad6a12ba8660aca45a7f2b55568..a35544c50593f8b11b852525ed7b49d4bf13e00c 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -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 5dee9fa47db9d61748d67e368b5d27f5b7878e96..ce23eed046b0845b0c49d281f4edfcdafd7e2ccb 100644 (file)
--- a/src/include/utils/guc.h
+++ b/src/include/utils/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 6e34ffa236999a3d6061b1b13ba0abbfda7acb48..a276959db6326f8dd13f3990ae45ab32bbe28a0c 100644 (file)
--- a/src/include/utils/guc_tables.h
+++ b/src/include/utils/guc_tables.h
@@ -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
 {