diff options
Diffstat (limited to 'src/backend/utils/misc/guc.c')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index aeb044f7d17..2f99d3d5f41 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -5,7 +5,7 @@ * command, configuration file, and command line options. * See src/backend/utils/misc/README for more information. * - * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.113 2003/01/28 18:04:02 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.114 2003/02/06 20:25:33 tgl Exp $ * * Copyright 2000 by PostgreSQL Global Development Group * Written by Peter Eisentraut <peter_e@gmx.net>. @@ -127,6 +127,7 @@ static double phony_random_seed; static char *client_encoding_string; static char *datestyle_string; static char *default_iso_level_string; +static char *regex_flavor_string; static char *server_encoding_string; static char *session_authorization_string; static char *timezone_string; @@ -568,7 +569,7 @@ static struct config_int }, { - {"deadlock_timeout", PGC_POSTMASTER}, &DeadlockTimeout, + {"deadlock_timeout", PGC_SIGHUP}, &DeadlockTimeout, 1000, 0, INT_MAX, NULL, NULL }, @@ -819,6 +820,11 @@ static struct config_string }, { + {"regex_flavor", PGC_USERSET}, ®ex_flavor_string, + "advanced", assign_regex_flavor, NULL + }, + + { {"search_path", PGC_USERSET, GUC_LIST_INPUT | GUC_LIST_QUOTE}, &namespace_search_path, "$user,public", assign_search_path, NULL |