diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index 19ff9597d5..16ad849d8f 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.25 2000/04/25 02:45:54 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.26 2000/04/25 10:38:38 inoue Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -714,7 +714,8 @@ ReindexIndex(const char *name, bool force /* currently unused */ )
 			 ((Form_pg_class) GETSTRUCT(tuple))->relkind);
 	}
 
-	reindex_index(tuple->t_data->t_oid, force);
+	if (!reindex_index(tuple->t_data->t_oid, force))
+		elog(NOTICE, "index '%s' wasn't reindexed", name);
 }
 
 /*
@@ -744,7 +745,8 @@ ReindexTable(const char *name, bool force)
 			 ((Form_pg_class) GETSTRUCT(tuple))->relkind);
 	}
 
-	reindex_relation(tuple->t_data->t_oid, force);
+	if (!reindex_relation(tuple->t_data->t_oid, force))
+		elog(NOTICE, "table '%s' wasn't reindexed", name);
 }
 
 /*
@@ -806,7 +808,6 @@ ReindexDatabase(const char *dbname, bool force, bool all)
 		elog(ERROR, "REINDEX DATABASE: Can be executed only on the currently open database.");
 
 	heap_close(relation, NoLock);
-	/** reindex_database(db_id, force, !all); **/
 
 	CommonSpecialPortalOpen();
 	pmem = CommonSpecialPortalGetMemory();
@@ -847,7 +848,8 @@ ReindexDatabase(const char *dbname, bool force, bool all)
 	for (i = 0; i < relcnt; i++)
 	{
 		StartTransactionCommand();
-		reindex_relation(relids[i], force);
+		if (reindex_relation(relids[i], force))
+			elog(NOTICE, "relation %d was reindexed", relids[i]);
 		CommitTransactionCommand();
 	}
 	CommonSpecialPortalClose();
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 2cc10fe1cd..89ac3a635a 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.86 2000/04/12 17:15:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.87 2000/04/25 10:38:38 inoue Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -865,11 +865,11 @@ ProcessUtility(Node *parsetree,
 						if (IsSystemRelationName(relname))
 						{
 							if (!allowSystemTableMods && IsSystemRelationName(relname))
-								elog(ERROR, "class \"%s\" is a system catalog index",
-									 relname);
+								elog(ERROR, "\"%s\" is a system index. call REINDEX under standalone postgres with -O -P options",
+								 relname);
 							if (!IsIgnoringSystemIndexes())
-								elog(ERROR, "class \"%s\" is a system catalog index",
-									 relname);
+								elog(ERROR, "\"%s\" is a system index. call REINDEX under standalone postgres with -P -O options",
+								 relname);
 						}
 #ifndef NO_SECURITY
 						if (!pg_ownercheck(userName, relname, RELNAME))
@@ -882,11 +882,12 @@ ProcessUtility(Node *parsetree,
 						if (IsSystemRelationName(relname))
 						{
 							if (!allowSystemTableMods && IsSystemRelationName(relname))
-								elog(ERROR, "class \"%s\" is a system catalog index",
-									 relname);
+								elog(ERROR, "\"%s\" is a system table. call REINDEX under standalone postgres with -O -P options",
+								 relname);
 							if (!IsIgnoringSystemIndexes())
-								elog(ERROR, "class \"%s\" is a system catalog index",
-									 relname);
+								elog(ERROR, "\"%s\" is a system table. call REINDEX under standalone postgres with -P -O options",
+
+								 relname);
 						}
 #ifndef NO_SECURITY
 						if (!pg_ownercheck(userName, relname, RELNAME))
@@ -897,9 +898,9 @@ ProcessUtility(Node *parsetree,
 					case DATABASE:
 						relname = (char *) stmt->name;
 						if (!allowSystemTableMods)
-							elog(ERROR, "-O option is needed");
+							elog(ERROR, "must be called under standalone postgres with -O -P options");
 						if (!IsIgnoringSystemIndexes())
-							elog(ERROR, "-P option is needed");
+							elog(ERROR, "must be called under standalone postgres with -P -O options");
 						ReindexDatabase(relname, stmt->force, false);
 						break;
 				}