postgres.git / summary / log / commit / refs

commit    d09affdc480786dd38deae5fcdbf472fbe324117
Author:   Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date:     Mon Oct 08 11:17:27 2012 +0000
First released in: 9.3.0, 9.0.11, 9.1.7, 9.2.2

    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:


[parent: bea34106a642]