Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 1c24154

Browse files
committed
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
1 parent 00941bf commit 1c24154

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

src/backend/utils/misc/guc.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Written by Peter Eisentraut <peter_e@gmx.net>.
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.141 2003/07/28 00:09:16 tgl Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.142 2003/07/28 16:22:02 momjian Exp $
1414
*
1515
*--------------------------------------------------------------------
1616
*/
@@ -156,7 +156,7 @@ static char *XactIsoLevel_string;
156156

157157

158158
/*
159-
* Used for pg_settings. Keep in sync with config_type enum above
159+
* Used for pg_settings. Keep in sync with config_type enum in guc_tables.h
160160
*/
161161
static char *config_type_name[] =
162162
{
@@ -176,6 +176,7 @@ static char *GucContextName[] =
176176
"sighup",
177177
"backend",
178178
"super-user",
179+
"userlimit",
179180
"user"
180181
};
181182

@@ -188,6 +189,7 @@ static char *GucSourceName[] =
188189
"environment variable",
189190
"configuration file",
190191
"command line",
192+
"userstart",
191193
"database",
192194
"user",
193195
"client",

src/include/utils/guc.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Copyright 2000-2003 by PostgreSQL Global Development Group
88
* Written by Peter Eisentraut <peter_e@gmx.net>.
99
*
10-
* $Id: guc.h,v 1.36 2003/07/27 04:35:54 momjian Exp $
10+
* $Id: guc.h,v 1.37 2003/07/28 16:22:13 momjian Exp $
1111
*--------------------------------------------------------------------
1212
*/
1313
#ifndef GUC_H
@@ -52,6 +52,8 @@
5252
* non-super users.
5353
*
5454
* USERSET options can be set by anyone any time.
55+
*
56+
* Keep in sync with GucContextName in guc.c
5557
*/
5658
typedef enum
5759
{

src/include/utils/guc_tables.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
99
*
10-
* $Id: guc_tables.h,v 1.2 2003/07/27 04:35:54 momjian Exp $
10+
* $Id: guc_tables.h,v 1.3 2003/07/28 16:22:16 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -58,6 +58,8 @@ enum config_group
5858

5959
/*
6060
* GUC supports these types of variables:
61+
*
62+
* Keep in sync with config_type_name in guc.c
6163
*/
6264
enum config_type
6365
{

0 commit comments

Comments
 (0)