diff options
| author | Bruce Momjian | 2013-05-29 20:58:43 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2013-05-29 20:58:43 +0000 |
| commit | 9af4159fce6654aa0e081b00d02bca40b978745c (patch) | |
| tree | 3aa507fc6cc67ed3d9f6ceec4d65d1e56cc08e1a /src/backend/commands/dbcommands.c | |
| parent | 07ab261ef3a9575a4a2bd3045b222d7b3dee2c46 (diff) | |
pgindent run for release 9.3
This is the first run of the Perl-based pgindent script. Also update
pgindent instructions.
Diffstat (limited to 'src/backend/commands/dbcommands.c')
| -rw-r--r-- | src/backend/commands/dbcommands.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index b3911bff350..0e10a752180 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -788,7 +788,7 @@ dropdb(const char *dbname, bool missing_ok) pgdbrel = heap_open(DatabaseRelationId, RowExclusiveLock); if (!get_db_info(dbname, AccessExclusiveLock, &db_id, NULL, NULL, - &db_istemplate, NULL, NULL, NULL, NULL, NULL, NULL, NULL)) + &db_istemplate, NULL, NULL, NULL, NULL, NULL, NULL, NULL)) { if (!missing_ok) { @@ -1043,7 +1043,7 @@ movedb(const char *dbname, const char *tblspcname) pgdbrel = heap_open(DatabaseRelationId, RowExclusiveLock); if (!get_db_info(dbname, AccessExclusiveLock, &db_id, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, &src_tblspcoid, NULL, NULL)) + NULL, NULL, NULL, NULL, NULL, &src_tblspcoid, NULL, NULL)) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_DATABASE), errmsg("database \"%s\" does not exist", dbname))); @@ -1334,7 +1334,7 @@ Oid AlterDatabase(AlterDatabaseStmt *stmt, bool isTopLevel) { Relation rel; - Oid dboid; + Oid dboid; HeapTuple tuple, newtuple; ScanKeyData scankey; @@ -1882,8 +1882,11 @@ static int errdetail_busy_db(int notherbackends, int npreparedxacts) { if (notherbackends > 0 && npreparedxacts > 0) - /* We don't deal with singular versus plural here, since gettext - * doesn't support multiple plurals in one string. */ + + /* + * We don't deal with singular versus plural here, since gettext + * doesn't support multiple plurals in one string. + */ errdetail("There are %d other session(s) and %d prepared transaction(s) using the database.", notherbackends, npreparedxacts); else if (notherbackends > 0) @@ -1893,7 +1896,7 @@ errdetail_busy_db(int notherbackends, int npreparedxacts) notherbackends); else errdetail_plural("There is %d prepared transaction using the database.", - "There are %d prepared transactions using the database.", + "There are %d prepared transactions using the database.", npreparedxacts, npreparedxacts); return 0; /* just to keep ereport macro happy */ |