From 77ede8900d96647a8293d76d08c0c5d47cc1049e Mon Sep 17 00:00:00 2001
From: Tom Lane
Date: Thu, 6 Feb 2003 20:25:33 +0000
Subject: Create a GUC variable REGEX_FLAVOR to control the type of regular
 expression accepted by the regex operators, per discussion yesterday.

Along the way, reduce deadlock_timeout from PGC_POSTMASTER to PGC_SIGHUP
category.  It is probably best to insist that all backends share the same
setting, but that doesn't mean it has to be frozen at startup.
---
 src/backend/utils/misc/guc.c                  | 10 ++++++++--
 src/backend/utils/misc/postgresql.conf.sample |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/backend/utils/misc')

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
 	},
 
@@ -818,6 +819,11 @@ static struct config_string
 		"C", locale_time_assign, NULL
 	},
 
+	{
+		{"regex_flavor", PGC_USERSET}, &regex_flavor_string,
+		"advanced", assign_regex_flavor, NULL
+	},
+
 	{
 		{"search_path", PGC_USERSET, GUC_LIST_INPUT | GUC_LIST_QUOTE},
 		&namespace_search_path,
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 2e7d63024b7..f40c2a00355 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -208,6 +208,7 @@
 #max_expr_depth = 10000		# min 10
 #max_files_per_process = 1000	# min 25
 #password_encryption = true
+#regex_flavor = advanced	# advanced, extended, or basic
 #sql_inheritance = true
 #transform_null_equals = false
 #statement_timeout = 0		# 0 is disabled, in milliseconds
-- 
cgit v1.2.3