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
This commit is contained in:
Bruce Momjian 2003-07-28 16:22:16 +00:00
parent 00941bf9ba
commit 1c241545e3
3 changed files with 10 additions and 4 deletions

View File

@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>. * Written by Peter Eisentraut <peter_e@gmx.net>.
* *
* IDENTIFICATION * 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[] = static char *config_type_name[] =
{ {
@ -176,6 +176,7 @@ static char *GucContextName[] =
"sighup", "sighup",
"backend", "backend",
"super-user", "super-user",
"userlimit",
"user" "user"
}; };
@ -188,6 +189,7 @@ static char *GucSourceName[] =
"environment variable", "environment variable",
"configuration file", "configuration file",
"command line", "command line",
"userstart",
"database", "database",
"user", "user",
"client", "client",

View File

@ -7,7 +7,7 @@
* Copyright 2000-2003 by PostgreSQL Global Development Group * Copyright 2000-2003 by PostgreSQL Global Development Group
* Written by Peter Eisentraut <peter_e@gmx.net>. * 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 #ifndef GUC_H
@ -52,6 +52,8 @@
* non-super users. * non-super users.
* *
* USERSET options can be set by anyone any time. * USERSET options can be set by anyone any time.
*
* Keep in sync with GucContextName in guc.c
*/ */
typedef enum typedef enum
{ {

View File

@ -7,7 +7,7 @@
* *
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * 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: * GUC supports these types of variables:
*
* Keep in sync with config_type_name in guc.c
*/ */
enum config_type enum config_type
{ {