diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2013-08-09 07:59:53 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2013-08-09 07:59:53 -0400 |
| commit | 595f52f8171e9805c5753510a180faeb68165055 (patch) | |
| tree | 806115a6c153edb24342420fece16429c4d9daca /src/backend/access/transam/multixact.c | |
| parent | 92d003fcbfb73eebf0c1782dbd53c6e2f14d5cc4 (diff) | |
Message punctuation and pluralization fixes
Diffstat (limited to 'src/backend/access/transam/multixact.c')
| -rw-r--r-- | src/backend/access/transam/multixact.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c index 95a39db545c..b553518bab6 100644 --- a/src/backend/access/transam/multixact.c +++ b/src/backend/access/transam/multixact.c @@ -940,14 +940,18 @@ GetNewMultiXactId(int nmembers, MultiXactOffset *offset) /* complain even if that DB has disappeared */ if (oldest_datname) ereport(WARNING, - (errmsg("database \"%s\" must be vacuumed before %u more MultiXactIds are used", + (errmsg_plural("database \"%s\" must be vacuumed before %u more MultiXactId is used", + "database \"%s\" must be vacuumed before %u more MultiXactIds are used", + multiWrapLimit - result, oldest_datname, multiWrapLimit - result), errhint("Execute a database-wide VACUUM in that database.\n" "You might also need to commit or roll back old prepared transactions."))); else ereport(WARNING, - (errmsg("database with OID %u must be vacuumed before %u more MultiXactIds are used", + (errmsg_plural("database with OID %u must be vacuumed before %u more MultiXactId is used", + "database with OID %u must be vacuumed before %u more MultiXactIds are used", + multiWrapLimit - result, oldest_datoid, multiWrapLimit - result), errhint("Execute a database-wide VACUUM in that database.\n" @@ -1982,14 +1986,18 @@ SetMultiXactIdLimit(MultiXactId oldest_datminmxid, Oid oldest_datoid) if (oldest_datname) ereport(WARNING, - (errmsg("database \"%s\" must be vacuumed before %u more MultiXactIds are used", + (errmsg_plural("database \"%s\" must be vacuumed before %u more MultiXactId is used", + "database \"%s\" must be vacuumed before %u more MultiXactIds are used", + multiWrapLimit - curMulti, oldest_datname, multiWrapLimit - curMulti), errhint("To avoid a database shutdown, execute a database-wide VACUUM in that database.\n" "You might also need to commit or roll back old prepared transactions."))); else ereport(WARNING, - (errmsg("database with OID %u must be vacuumed before %u more MultiXactIds are used", + (errmsg_plural("database with OID %u must be vacuumed before %u more MultiXactId is used", + "database with OID %u must be vacuumed before %u more MultiXactIds are used", + multiWrapLimit - curMulti, oldest_datoid, multiWrapLimit - curMulti), errhint("To avoid a database shutdown, execute a database-wide VACUUM in that database.\n" |