@@ -172,6 +172,7 @@ typedef struct LVRelState
172172bool skippedallvis ;
173173
174174/* Error reporting state */
175+ char * dbname ;
175176char * relnamespace ;
176177char * relname ;
177178char * indname ;/* Current index name */
@@ -354,6 +355,7 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,
354355 * these temp copies.
355356 */
356357vacrel = (LVRelState * )palloc0 (sizeof (LVRelState ));
358+ vacrel -> dbname = get_database_name (MyDatabaseId );
357359vacrel -> relnamespace = get_namespace_name (RelationGetNamespace (rel ));
358360vacrel -> relname = pstrdup (RelationGetRelationName (rel ));
359361vacrel -> indname = NULL ;
@@ -475,13 +477,13 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,
475477if (vacrel -> aggressive )
476478ereport (INFO ,
477479(errmsg ("aggressively vacuuming \"%s.%s.%s\"" ,
478- get_database_name ( MyDatabaseId ) ,
479- vacrel -> relnamespace , vacrel -> relname )));
480+ vacrel -> dbname , vacrel -> relnamespace ,
481+ vacrel -> relname )));
480482else
481483ereport (INFO ,
482484(errmsg ("vacuuming \"%s.%s.%s\"" ,
483- get_database_name ( MyDatabaseId ) ,
484- vacrel -> relnamespace , vacrel -> relname )));
485+ vacrel -> dbname , vacrel -> relnamespace ,
486+ vacrel -> relname )));
485487}
486488
487489/*
@@ -650,7 +652,7 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,
650652msgfmt = _ ("automatic vacuum of table \"%s.%s.%s\": index scans: %d\n" );
651653}
652654appendStringInfo (& buf ,msgfmt ,
653- get_database_name ( MyDatabaseId ) ,
655+ vacrel -> dbname ,
654656vacrel -> relnamespace ,
655657vacrel -> relname ,
656658vacrel -> num_index_scans );
@@ -2614,9 +2616,7 @@ lazy_check_wraparound_failsafe(LVRelState *vacrel)
26142616
26152617ereport (WARNING ,
26162618(errmsg ("bypassing nonessential maintenance of table \"%s.%s.%s\" as a failsafe after %d index scans" ,
2617- get_database_name (MyDatabaseId ),
2618- vacrel -> relnamespace ,
2619- vacrel -> relname ,
2619+ vacrel -> dbname ,vacrel -> relnamespace ,vacrel -> relname ,
26202620vacrel -> num_index_scans ),
26212621errdetail ("The table's relfrozenxid or relminmxid is too far in the past." ),
26222622errhint ("Consider increasing configuration parameter \"maintenance_work_mem\" or \"autovacuum_work_mem\".\n"