Update copyright for 2014

[postgresql] / src / include / utils / guc_tables.h

diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h
index d3b25812a02866bf6dbabe373592de31f88e3509..47ff88051787d2f0e40da36b6f7828ec73f70a2b 100644 (file)
--- a/src/include/utils/guc_tables.h
+++ b/src/include/utils/guc_tables.h
@@ -5,7 +5,7 @@
  *
  * See src/backend/utils/misc/README for design notes.
  *
- * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group
  *
  *       src/include/utils/guc_tables.h
  *
@@ -69,6 +69,7 @@ enum config_group
        WAL_CHECKPOINTS,
        WAL_ARCHIVING,
        REPLICATION,
+       REPLICATION_SENDING,
        REPLICATION_MASTER,
        REPLICATION_STANDBY,
        QUERY_TUNING,
@@ -87,6 +88,7 @@ enum config_group
        CLIENT_CONN,
        CLIENT_CONN_STATEMENT,
        CLIENT_CONN_LOCALE,
+       CLIENT_CONN_PRELOAD,
        CLIENT_CONN_OTHER,
        LOCK_MANAGEMENT,
        COMPAT_OPTIONS,
@@ -117,9 +119,11 @@ typedef struct guc_stack
        int                     nest_level;             /* nesting depth at which we made entry */
        GucStackState state;            /* see enum above */
        GucSource       source;                 /* source of the prior value */
+       /* masked value's source must be PGC_S_SESSION, so no need to store it */
+       GucContext      scontext;               /* context that set the prior value */
+       GucContext      masked_scontext;        /* context that set the masked value */
        config_var_value prior;         /* previous value of variable */
        config_var_value masked;        /* SET value in a GUC_SET_LOCAL entry */
-       /* masked value's source must be PGC_S_SESSION, so no need to store it */
 } GucStack;
 
 /*
@@ -142,21 +146,21 @@ struct config_generic
        enum config_group group;        /* to help organize variables by function */
        const char *short_desc;         /* short desc. of this variable's purpose */
        const char *long_desc;          /* long desc. of this variable's purpose */
-       int                     flags;                  /* flag bits, see below */
+       int                     flags;                  /* flag bits, see guc.h */
        /* variable fields, initialized at runtime: */
        enum config_type vartype;       /* type of variable (set only at startup) */
        int                     status;                 /* status bits, see below */
-       GucSource       reset_source;   /* source of the reset_value */
        GucSource       source;                 /* source of the current actual value */
+       GucSource       reset_source;   /* source of the reset_value */
+       GucContext      scontext;               /* context that set the current value */
+       GucContext      reset_scontext; /* context that set the reset value */
        GucStack   *stack;                      /* stacked prior values */
        void       *extra;                      /* "extra" pointer for current actual value */
        char       *sourcefile;         /* file current setting is from (NULL if not
-                                                                * file) */
+                                                                * set in config file) */
        int                     sourceline;             /* line in source file */
 };
 
-/* bit values in flags field are defined in guc.h */
-
 /* bit values in status field */
 #define GUC_IS_IN_FILE         0x0001          /* found it in config file */
 /*
@@ -258,5 +262,4 @@ extern const char *config_enum_lookup_by_value(struct config_enum * record, int
 extern bool config_enum_lookup_by_name(struct config_enum * record,
                                                   const char *value, int *retval);
 
-
 #endif   /* GUC_TABLES_H */