From 0764f41306aba91dbe962e49e92c09adcc529997 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 9 Jan 2007 22:16:46 +0000
Subject: [PATCH] Have log_temp_files be in kilobytes, remove trace call.

---
 doc/src/sgml/config.sgml                      | 4 ++--
 src/backend/utils/misc/guc.c                  | 6 +++---
 src/backend/utils/misc/postgresql.conf.sample | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 068a85f27bd..de88650b0ed 100644
--- 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 4d4ef07d2c7..16f52bdf565 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.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 989126477d1..3f546f10c40 100644
--- 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
 
 #---------------------------------------------------------------------------