Fix a case of string building.

diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c
index b830d668426d89c7c9b47dd960d4208466ce5c41..8cd1abdf1b95428008ecb2f3f31036f8b07c9ce3 100644 (file)
--- a/src/backend/catalog/dependency.c
+++ b/src/backend/catalog/dependency.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.81 2008/10/04 21:56:52 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.82 2008/11/10 21:49:16 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2094,9 +2094,13 @@ getObjectDescription(const ObjectAddress *object)
 
                                if (OidIsValid(con->conrelid))
                                {
-                                       appendStringInfo(&buffer, _("constraint %s on "),
-                                                                        NameStr(con->conname));
-                                       getRelationDescription(&buffer, con->conrelid);
+                                       StringInfoData  rel;
+
+                                       initStringInfo(&rel);
+                                       getRelationDescription(&rel, con->conrelid);
+                                       appendStringInfo(&buffer, _("constraint %s on %s"),
+                                                                        NameStr(con->conname), rel.data);
+                                       pfree(rel.data);
                                }
                                else
                                {

diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c
index 4e7d50b526a830a4b589b9497d87d652f0131847..bc342839d99d174d90bd32ee31d0a35391818da1 100644 (file)
--- a/src/backend/utils/adt/tsvector_op.c
+++ b/src/backend/utils/adt/tsvector_op.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.16 2008/05/16 16:31:01 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.17 2008/11/10 21:49:16 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1348,7 +1348,7 @@ tsvector_update_trigger(PG_FUNCTION_ARGS, bool config_column)
                if (!is_text_type(SPI_gettypeid(rel->rd_att, numattr)))
                        ereport(ERROR,
                                        (errcode(ERRCODE_DATATYPE_MISMATCH),
-                                        errmsg("column \"%s\" is not of character type",
+                                        errmsg("column \"%s\" is not of a character type",
                                                        trigger->tgargs[i])));
 
                datum = SPI_getbinval(rettuple, rel->rd_att, numattr, &isnull);