diff options
| author | Bruce Momjian | 2002-07-13 01:02:14 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2002-07-13 01:02:14 +0000 |
| commit | 4db8718e84a40125e8a7c2ffcfccf50932cdfd85 (patch) | |
| tree | 8bc5fe0215602ad80001676193f47918ad1df29d /src/backend/utils | |
| parent | ccb3f90f0695d87e29ee066dd64183fa29edfc3f (diff) | |
Add SET statement_timeout capability. Timeout is in ms. A value of
zero turns off the timer.
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 8 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 53503f4b413..5162509b261 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.70 2002/06/16 00:09:12 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.71 2002/07/13 01:02:14 momjian Exp $ * * Copyright 2000 by PostgreSQL Global Development Group * Written by Peter Eisentraut <peter_e@gmx.net>. @@ -51,6 +51,7 @@ extern bool Log_connections; extern int PreAuthDelay; extern int AuthenticationTimeout; +extern int StatementTimeout; extern int CheckPointTimeout; extern int CommitDelay; extern int CommitSiblings; @@ -576,6 +577,11 @@ static struct config_int }, { + { "statement_timeout", PGC_USERSET }, &StatementTimeout, + 0, 0, INT_MAX, NULL, NULL + }, + + { { "max_fsm_relations", PGC_POSTMASTER }, &MaxFSMRelations, 100, 10, INT_MAX, NULL, NULL }, diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index 00dced8d394..bf141249ae0 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -200,3 +200,4 @@ #password_encryption = true #sql_inheritance = true #transform_null_equals = false +#statement_timeout = 0 # 0 is disabled |