String fixes/improvements found by Alvaro Herrera

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 9d0ebbd148053a183136664e74f8462d2b8c0987..3ece4f80f9586f275a95dc7f6aec9956d02bab31 100644 (file)
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.84 2003/09/29 00:05:25 petere Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.85 2003/10/02 06:36:37 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -4090,7 +4090,7 @@ AlterTableCreateToastTable(Oid relOid, bool silent)
 
                ereport(ERROR,
                                (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-                                errmsg("tables \"%s\" already has a TOAST table",
+                                errmsg("table \"%s\" already has a TOAST table",
                                                RelationGetRelationName(rel))));
        }
 

diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index c6c9b7f9a3df4e112f5715fc61d9269e8baa6565..13e80283ff254138bad9c467b1e5379ee199dfb2 100644 (file)
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.127 2003/09/29 00:05:25 petere Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.128 2003/10/02 06:36:37 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -648,7 +648,7 @@ CreateUser(CreateUserStmt *stmt)
        if (sysid_exists)
                ereport(ERROR,
                                (errcode(ERRCODE_DUPLICATE_OBJECT),
-                                errmsg("sysid %d is already assigned", sysid)));
+                                errmsg("user ID %d is already assigned", sysid)));
 
        /* If no sysid given, use max existing id + 1 */
        if (!havesysid)
@@ -1354,7 +1354,7 @@ CreateGroup(CreateGroupStmt *stmt)
        if (sysid_exists)
                ereport(ERROR,
                                (errcode(ERRCODE_DUPLICATE_OBJECT),
-                                errmsg("sysid %d is already assigned", sysid)));
+                                errmsg("group ID %d is already assigned", sysid)));
 
        /* If no sysid given, use max existing id + 1 */
        if (!havesysid)