aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert Haas <rhaas@postgresql.org>2010-07-06 22:55:26 +0000
committerRobert Haas <rhaas@postgresql.org>2010-07-06 22:55:26 +0000
commit20be0d480a167c86b505d9a3b477441446c4e999 (patch)
tree39678d50da168ac581cd27f12254003015342a79 /src
parent458474d9d7ff552d697f8a85a61113582c86ae3a (diff)
downloadpostgresql-20be0d480a167c86b505d9a3b477441446c4e999.tar.gz
postgresql-20be0d480a167c86b505d9a3b477441446c4e999.zip
Make log_temp_files based on kB, and revert docs & comments to match.
Per extensive discussion on pgsql-hackers. We are deliberately not back-patching this even though the behavior of 8.3 and 8.4 is unquestionably broken, for fear of breaking existing users of this parameter. This incompatibility should be release-noted.
Diffstat (limited to 'src')
-rw-r--r--src/backend/storage/file/fd.c4
-rw-r--r--src/backend/utils/misc/guc.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index f68129a8b87..91bf4af8e4d 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/storage/file/fd.c,v 1.156 2010/02/26 02:00:59 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/storage/file/fd.c,v 1.157 2010/07/06 22:55:26 rhaas Exp $
*
* NOTES:
*
@@ -1062,7 +1062,7 @@ FileClose(File file)
{
if (stat(vfdP->fileName, &filestats) == 0)
{
- if (filestats.st_size >= log_temp_files)
+ if ((filestats.st_size / 1024) >= log_temp_files)
ereport(LOG,
(errmsg("temporary file: path \"%s\", size %lu",
vfdP->fileName,
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index dd0e10ca93c..08704d48cf0 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.560 2010/07/06 19:18:58 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.561 2010/07/06 22:55:26 rhaas Exp $
*
*--------------------------------------------------------------------
*/
@@ -2061,7 +2061,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"log_temp_files", PGC_SUSET, LOGGING_WHAT,
- gettext_noop("Log the use of temporary files larger than this number of bytes."),
+ gettext_noop("Log the use of temporary files larger than this number of kilobytes."),
gettext_noop("Zero logs all files. The default is -1 (turning this feature off)."),
GUC_UNIT_KB
},