Say ANALYZE, not VACUUM, in error message on analyze in hot standby.

Tomonaru Katsumata
13 years ago · b28cc92d7d
parent 9c0e2b9182
commit b28cc92d7d
1 changed files with 8 additions and 4 deletions
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@ -1123,10 +1123,14 @@ standard_ProcessUtility(Node *parsetree,
 			break;

 		case T_VacuumStmt:
-			/* we choose to allow this during "read only" transactions */
-			PreventCommandDuringRecovery("VACUUM");
-			vacuum((VacuumStmt *) parsetree, InvalidOid, true, NULL, false,
-				   isTopLevel);
+			{
+				VacuumStmt *stmt = (VacuumStmt *) parsetree;
+
+				/* we choose to allow this during "read only" transactions */
+				PreventCommandDuringRecovery((stmt->options & VACOPT_VACUUM) ?
+											 "VACUUM" : "ANALYZE");
+				vacuum(stmt, InvalidOid, true, NULL, false, isTopLevel);
+			}
 			break;

 		case T_ExplainStmt: