Have log_temp_files be in kilobytes, remove trace call.

diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 068a85f27bde7c8df12c2b625291f9107c0c3436..de88650b0ed2fe317fdb9b77b2c1ade88ff6e3a2 100644 (file)
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.100 2007/01/09 21:31:14 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.101 2007/01/09 22:16:46 momjian Exp $ -->
 
 <chapter Id="runtime-config">
   <title>Server Configuration</title>
@@ -2930,7 +2930,7 @@ SELECT * FROM parent WHERE key = 2400;
         Controls whether temporary files are logged when deleted.
         A value of zero logs all temporary files, and positive
         values log only files whose size is equal or greater than
-        the specified number of bytes.  Temporary files can be
+        the specified number of kilobytes.  Temporary files can be
         created for sorts, hashes, and temporary results.  The
         default is <literal>-1</> (off).
        </para>

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 4d4ef07d2c7db8c0c0aed267bcdb4ea91de731db..16f52bdf5657c21ce100c0589f2505f29768e68d 100644 (file)
--- 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.366 2007/01/09 21:31:14 momjian Exp $
+ *       $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.367 2007/01/09 22:16:46 momjian Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -1664,9 +1664,9 @@ static struct config_int ConfigureNamesInt[] =
                                
        {
                {"log_temp_files", PGC_USERSET, LOGGING_WHAT,
-                       gettext_noop("Log the use of temporary files larger than this size."),
+                       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)."),
-                       NULL
+                       GUC_UNIT_KB
                },
                &log_temp_files,
                -1, -1, INT_MAX, NULL, NULL

diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 989126477d1c7bc7426e939455c489a34f34959c..3f546f10c40a6e41707096cd3f2ac190fe93e237 100644 (file)
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -334,7 +334,7 @@
 #log_hostname = off
 
 #log_temp_files = -1                   # Log temporary files equal or larger
-                                       # than the specified number of bytes.  
+                                       # than the specified number of kilobytes.
                                        # -1 disables;  0 logs all temp files
 
 #---------------------------------------------------------------------------