From 32b58d0220de9ea13670a2a9fff61360abfa36bc Mon Sep 17 00:00:00 2001
From: Tom Lane
Date: Mon, 24 Mar 2008 19:12:49 +0000
Subject: Fix various infelicities that have snuck into usage of errdetail()
 and friends.  Avoid double translation of some messages, ensure other
 messages are exposed for translation (and make them follow the style
 guidelines), avoid unsafe passing of an unpredictable message text as a
 format string.

---
 src/backend/commands/vacuumlazy.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/backend/commands')

diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuumlazy.c
index d524e52b555..d96d2ba49e6 100644
--- a/src/backend/commands/vacuumlazy.c
+++ b/src/backend/commands/vacuumlazy.c
@@ -38,7 +38,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/vacuumlazy.c,v 1.104 2008/03/10 02:04:09 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/vacuumlazy.c,v 1.105 2008/03/24 19:12:49 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -212,10 +212,10 @@ lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt,
 				(errmsg("relation \"%s.%s\" contains more than \"max_fsm_pages\" pages with useful free space",
 						get_namespace_name(RelationGetNamespace(onerel)),
 						RelationGetRelationName(onerel)),
-		errhint((vacrelstats->tot_free_pages > vacrelstats->rel_pages * 0.20 ?
-		/* Only suggest VACUUM FULL if 20% free */
-				 "Consider using VACUUM FULL on this relation or increasing the configuration parameter \"max_fsm_pages\"." :
-				 "Consider increasing the configuration parameter \"max_fsm_pages\"."))));
+				 /* Only suggest VACUUM FULL if > 20% free */
+				 (vacrelstats->tot_free_pages > vacrelstats->rel_pages * 0.20) ?
+				 errhint("Consider using VACUUM FULL on this relation or increasing the configuration parameter \"max_fsm_pages\".") :
+				 errhint("Consider increasing the configuration parameter \"max_fsm_pages\".")));
 
 	/* Update statistics in pg_class */
 	vac_update_relstats(RelationGetRelid(onerel),
-- 
cgit v1.2.3