From d09affdc480786dd38deae5fcdbf472fbe324117 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Mon, 8 Oct 2012 14:17:27 +0300 Subject: [PATCH] Say ANALYZE, not VACUUM, in error message on analyze in hot standby. Tomonaru Katsumata --- src/backend/tcop/utility.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index ec36644a492..c2d15a1728a 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -1006,10 +1006,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: -- 2.39.5