diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-06-20 18:31:39 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-06-20 18:31:39 +0000 |
| commit | 6f0072df774ab0b5af9d2b8d3123929a983da16d (patch) | |
| tree | 39a3141d3b4f788196fed46d103ef6d93960104e /src | |
| parent | cd407354eedfabfe9ffc87f3cab40583e4234861 (diff) | |
| download | postgresql-6f0072df774ab0b5af9d2b8d3123929a983da16d.tar.gz postgresql-6f0072df774ab0b5af9d2b8d3123929a983da16d.zip | |
Restrict deadlock_timeout to the range for which the implementation
actually works sanely, viz not 0 and not more than INT_MAX/1000
(else TimestampTzPlusMilliseconds can overflow). Per discussion with
Greg Stark. Since this is a superuser-only setting and there was not
previously any big reason to change it, not worth back-patching.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index c1e9d8e7213..f83c51b928c 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut <peter_e@gmx.net>. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.399 2007/06/19 20:13:22 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.400 2007/06/20 18:31:39 tgl Exp $ * *-------------------------------------------------------------------- */ @@ -1173,7 +1173,7 @@ static struct config_int ConfigureNamesInt[] = GUC_UNIT_MS }, &DeadlockTimeout, - 1000, 0, INT_MAX, NULL, NULL + 1000, 1, INT_MAX/1000, NULL, NULL }, /* |